[Extensions API] Remove inline enums

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

 // Copyright (c) 2013 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 <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
 #include "extensions/browser/event_router.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/strings/grit/app_locale_settings.h"
 #include "url/gurl.h"
 
 using base::BinaryValue;
 using content::BrowserThread;
 
+namespace wallpaper_base = extensions::api::wallpaper;
 namespace wallpaper_private = extensions::api::wallpaper_private;
 namespace set_wallpaper_if_exists = wallpaper_private::SetWallpaperIfExists;
 namespace set_wallpaper = wallpaper_private::SetWallpaper;
 namespace set_custom_wallpaper = wallpaper_private::SetCustomWallpaper;
 namespace set_custom_wallpaper_layout =
     wallpaper_private::SetCustomWallpaperLayout;
 namespace get_thumbnail = wallpaper_private::GetThumbnail;
 namespace save_thumbnail = wallpaper_private::SaveThumbnail;
 namespace get_offline_wallpaper_list =
     wallpaper_private::GetOfflineWallpaperList;
@@ skipping 293 matching lines @@
 
   base::FilePath wallpaper_path;
   base::FilePath fallback_path;
   chromeos::WallpaperManager::WallpaperResolution resolution =
       chromeos::WallpaperManager::Get()->GetAppropriateResolution();
 
   std::string file_name = GURL(params->url).ExtractFileName();
   CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS,
                          &wallpaper_path));
   fallback_path = wallpaper_path.Append(file_name);
-  if (params->layout != wallpaper_private::WALLPAPER_LAYOUT_STRETCH &&
+  if (params->layout != wallpaper_base::WALLPAPER_LAYOUT_STRETCH &&
       resolution == chromeos::WallpaperManager::WALLPAPER_RESOLUTION_SMALL) {
     file_name = base::FilePath(file_name)
                     .InsertBeforeExtension(wallpaper::kSmallWallpaperSuffix)
                     .value();
   }
   wallpaper_path = wallpaper_path.Append(file_name);
 
   sequence_token_ = BrowserThread::GetBlockingPool()->GetNamedSequenceToken(
       wallpaper::kWallpaperSequenceTokenName);
   scoped_refptr<base::SequencedTaskRunner> task_runner =
@@ skipping 38 matching lines @@
 }
 
 void WallpaperPrivateSetWallpaperIfExistsFunction::OnWallpaperDecoded(
     const gfx::ImageSkia& image) {
   // Set unsafe_wallpaper_decoder_ to null since the decoding already finished.
   unsafe_wallpaper_decoder_ = NULL;
 
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
   wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
-      wallpaper_private::ToString(params->layout));
+      wallpaper_base::ToString(params->layout));
 
   bool update_wallpaper =
       user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
   wallpaper_manager->SetWallpaperFromImageSkia(
       user_id_, image, layout, update_wallpaper);
   bool is_persistent = !user_manager::UserManager::Get()
                             ->IsCurrentUserNonCryptohomeDataEphemeral();
   wallpaper::WallpaperInfo info = {params->url,
                                    layout,
                                    user_manager::User::ONLINE,
@@ skipping 89 matching lines @@
                    this, error));
   }
 }
 
 void WallpaperPrivateSetWallpaperFunction::SetDecodedWallpaper(
     scoped_ptr<gfx::ImageSkia> image) {
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
 
   wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
-      wallpaper_private::ToString(params->layout));
+      wallpaper_base::ToString(params->layout));
 
   bool update_wallpaper =
       user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
   wallpaper_manager->SetWallpaperFromImageSkia(
       user_id_, *image.get(), layout, update_wallpaper);
 
   bool is_persistent = !user_manager::UserManager::Get()
                             ->IsCurrentUserNonCryptohomeDataEphemeral();
   wallpaper::WallpaperInfo info = {params->url,
                                    layout,
@@ skipping 69 matching lines @@
       wallpaper::kThumbnailWallpaperSubDir, user_id_hash_, params->file_name);
 
   sequence_token_ = BrowserThread::GetBlockingPool()->GetNamedSequenceToken(
       wallpaper::kWallpaperSequenceTokenName);
   scoped_refptr<base::SequencedTaskRunner> task_runner =
       BrowserThread::GetBlockingPool()->
           GetSequencedTaskRunnerWithShutdownBehavior(sequence_token_,
               base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 
   wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
-      wallpaper_private::ToString(params->layout));
+      wallpaper_base::ToString(params->layout));
 
   bool update_wallpaper =
       user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
   wallpaper_manager->SetCustomWallpaper(user_id_,
                                         user_id_hash_,
                                         params->file_name,
                                         layout,
                                         user_manager::User::CUSTOMIZED,
                                         image,
                                         update_wallpaper);
@@ skipping 61 matching lines @@
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
   wallpaper::WallpaperInfo info;
   wallpaper_manager->GetLoggedInUserWallpaperInfo(&info);
   if (info.type != user_manager::User::CUSTOMIZED) {
     SetError("Only custom wallpaper can change layout.");
     SendResponse(false);
     return false;
   }
   info.layout = wallpaper_api_util::GetLayoutEnum(
-      wallpaper_private::ToString(params->layout));
+      wallpaper_base::ToString(params->layout));
 
   std::string email =
       user_manager::UserManager::Get()->GetActiveUser()->email();
   bool is_persistent = !user_manager::UserManager::Get()
                             ->IsCurrentUserNonCryptohomeDataEphemeral();
   wallpaper_manager->SetUserWallpaperInfo(email, info, is_persistent);
   wallpaper_manager->UpdateWallpaper(false /* clear_cache */);
   SendResponse(true);
 
   // Gets email address while at UI thread.
@@ skipping 35 matching lines @@
 }
 
 bool WallpaperPrivateGetThumbnailFunction::RunAsync() {
   scoped_ptr<get_thumbnail::Params> params(
       get_thumbnail::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   base::FilePath thumbnail_path;
   std::string email =
       user_manager::UserManager::Get()->GetActiveUser()->email();
-  if (params->source == get_thumbnail::Params::SOURCE_ONLINE) {
+  if (params->source == wallpaper_private::WALLPAPER_SOURCE_ONLINE) {
     std::string file_name = GURL(params->url_or_file).ExtractFileName();
     CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPER_THUMBNAILS,
                            &thumbnail_path));
     thumbnail_path = thumbnail_path.Append(file_name);
   } else {
     if (!IsOEMDefaultWallpaper()) {
       SetError("No OEM wallpaper.");
       SendResponse(false);
       return false;
     }
@@ skipping 156 matching lines @@
                  this, file_list));
 }
 
 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete(
     const std::vector<std::string>& file_list) {
   base::ListValue* results = new base::ListValue();
   results->AppendStrings(file_list);
   SetResult(results);
   SendResponse(true);
 }