Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / extensions / wallpaper_function_base.cc

diff --git a/src/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/src/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
index 6e89013..11f4a06 100644 (file)
--- a/src/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
+++ b/src/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
@@ -16,7 +16,7 @@ namespace wallpaper_api_util {
 namespace {
 
 // Keeps in sync (same order) with WallpaperLayout enum in header file.
-const char* kWallpaperLayoutArrays[] = {
+const char* const kWallpaperLayoutArrays[] = {
   "CENTER",
   "CENTER_CROPPED",
   "STRETCH",
@@ -25,7 +25,7 @@ const char* kWallpaperLayoutArrays[] = {
 
 const int kWallpaperLayoutCount = arraysize(kWallpaperLayoutArrays);
 
-} // namespace
+}  // namespace
 
 const char kCancelWallpaperMessage[] = "Set wallpaper was canceled.";
 
@@ -68,7 +68,7 @@ class WallpaperFunctionBase::UnsafeWallpaperDecoder
   }
 
   virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image) OVERRIDE {
+                              const SkBitmap& decoded_image) override {
     // Make the SkBitmap immutable as we won't modify it. This is important
     // because otherwise it gets duplicated during painting, wasting memory.
     SkBitmap immutable(decoded_image);
@@ -84,7 +84,7 @@ class WallpaperFunctionBase::UnsafeWallpaperDecoder
     delete this;
   }
 
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE {
+  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override {
     function_->OnFailure(
         l10n_util::GetStringUTF8(IDS_WALLPAPER_MANAGER_INVALID_WALLPAPER));
     delete this;