Remove use of index in wallpaper picker code and some refactor

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
 
 #include <vector>
 
-#include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
@@ skipping 12 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::BinaryValue;
 using content::BrowserThread;
 
 namespace {
 
+// Keeps in sync (same order) with WallpaperLayout enum in header file.
+const char* kWallpaperLayoutArrays[] = {
+    "CENTER",
+    "CENTER_CROPPED",
+    "STRETCH",
+    "TILE"
+};
+
+const int kWallpaperLayoutCount = arraysize(kWallpaperLayoutArrays);
+
+ash::WallpaperLayout GetLayoutEnum(const std::string& layout) {
+  for (int i = 0; i < kWallpaperLayoutCount; i++) {
+    if (layout.compare(kWallpaperLayoutArrays[i]) == 0)
+      return static_cast<ash::WallpaperLayout>(i);
+  }
+  // Default to use CENTER layout.
+  return ash::WALLPAPER_LAYOUT_CENTER;
+}
+
 class WindowStateManager;
 
 // static
 WindowStateManager* g_window_state_manager = NULL;
 
 // WindowStateManager remembers which windows have been minimized in order to
 // restore them when the wallpaper viewer is hidden.
 class WindowStateManager : public aura::WindowObserver {
  public:
 
@@ skipping 183 matching lines @@
 
 bool WallpaperSetWallpaperFunction::RunImpl() {
   BinaryValue* input = NULL;
   if (args_ == NULL || !args_->GetBinary(0, &input)) {
     return false;
   }
   std::string layout_string;
   if (!args_->GetString(1, &layout_string) || layout_string.empty()) {
     return false;
   }
-  layout_ = ash::GetLayoutEnum(layout_string);
+  layout_ = GetLayoutEnum(layout_string);
   if (!args_->GetString(2, &url_) || url_.empty())
     return false;
 
   // Gets email address while at UI thread.
   email_ = chromeos::UserManager::Get()->GetLoggedInUser()->email();
 
   image_data_.assign(input->GetBuffer(), input->GetSize());
   if (wallpaper_decoder_)
     wallpaper_decoder_->Cancel();
   wallpaper_decoder_ = new WallpaperDecoder(this);
@@ skipping 39 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WallpaperSetWallpaperFunction::SetDecodedWallpaper,
                    this, base::Passed(&deep_copy)));
     chromeos::UserImage wallpaper(wallpaper_);
 
     // Generates and saves small resolution wallpaper. Uses CENTER_CROPPED to
     // maintain the aspect ratio after resize.
     chromeos::WallpaperManager::Get()->ResizeAndSaveWallpaper(
         wallpaper,
         file_path.InsertBeforeExtension(chromeos::kSmallWallpaperSuffix),
-        ash::CENTER_CROPPED,
+        ash::WALLPAPER_LAYOUT_CENTER_CROPPED,
         ash::kSmallWallpaperMaxWidth,
         ash::kSmallWallpaperMaxHeight);
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WallpaperSetWallpaperFunction::OnFailureOrCancel,
                    this, ""));
     LOG(ERROR) << "Failed to save downloaded wallpaper.";
   }
 }
@@ skipping 23 matching lines @@
 
 bool WallpaperSetCustomWallpaperFunction::RunImpl() {
   BinaryValue* input = NULL;
   if (args_ == NULL || !args_->GetBinary(0, &input)) {
     return false;
   }
   std::string layout_string;
   if (!args_->GetString(1, &layout_string) || layout_string.empty()) {
     return false;
   }
-  layout_ = ash::GetLayoutEnum(layout_string);
+  layout_ = GetLayoutEnum(layout_string);
 
   // Gets email address while at UI thread.
   email_ = chromeos::UserManager::Get()->GetLoggedInUser()->email();
 
   image_data_.assign(input->GetBuffer(), input->GetSize());
   if (wallpaper_decoder_)
     wallpaper_decoder_->Cancel();
   wallpaper_decoder_ = new WallpaperDecoder(this);
   wallpaper_decoder_->Start(image_data_);
 
@@ skipping 31 matching lines @@
 }
 
 WallpaperRestoreMinimizedWindowsFunction::
     ~WallpaperRestoreMinimizedWindowsFunction() {
 }
 
 bool WallpaperRestoreMinimizedWindowsFunction::RunImpl() {
   WindowStateManager::RestoreWindows();
   return true;
 }