diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 06:11:05 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 06:11:05 +0000 |
| commit | a1e39cd7fd7af8d8a8934737ff09f59388c4d058 (patch) | |
| tree | efe69eefc22134f8a438a5c95e8c38d5c762b65a /ash/desktop_background | |
| parent | a7b00676ef397d9eaa27aaac02f36e05a07e569c (diff) | |
| download | chromium_src-a1e39cd7fd7af8d8a8934737ff09f59388c4d058.zip chromium_src-a1e39cd7fd7af8d8a8934737ff09f59388c4d058.tar.gz chromium_src-a1e39cd7fd7af8d8a8934737ff09f59388c4d058.tar.bz2 | |
ash: Remove ash_wallpaper_resources.
The default Chrome OS wallpaper is specified on the command
line now.
BUG=248764
Review URL: https://chromiumcodereview.appspot.com/18470004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller.cc | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index 9928893..14e5f70 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -23,7 +23,7 @@ #include "base/synchronization/cancellation_flag.h" #include "base/threading/worker_pool.h" #include "content/public/browser/browser_thread.h" -#include "grit/ash_wallpaper_resources.h" +#include "grit/ash_resources.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/compositor/layer.h" @@ -240,24 +240,9 @@ bool DesktopBackgroundController::SetDefaultWallpaper(bool is_guest) { base::FilePath file_path; WallpaperLayout file_layout = use_large ? WALLPAPER_LAYOUT_CENTER_CROPPED : WALLPAPER_LAYOUT_CENTER; - int resource_id = -1; - WallpaperLayout resource_layout = WALLPAPER_LAYOUT_TILE; - -#if defined(GOOGLE_CHROME_BUILD) - if (use_large) { - resource_id = is_guest ? IDR_AURA_WALLPAPERS_2_LANDSCAPE7_LARGE : - IDR_AURA_WALLPAPERS_2_LANDSCAPE8_LARGE; - resource_layout = WALLPAPER_LAYOUT_CENTER_CROPPED; - } else { - resource_id = is_guest ? IDR_AURA_WALLPAPERS_2_LANDSCAPE7_SMALL : - IDR_AURA_WALLPAPERS_2_LANDSCAPE8_SMALL; - resource_layout = WALLPAPER_LAYOUT_CENTER; - } -#else - resource_id = use_large ? IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE : + int resource_id = use_large ? IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE : IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL; - resource_layout = WALLPAPER_LAYOUT_TILE; -#endif + WallpaperLayout resource_layout = WALLPAPER_LAYOUT_TILE; const char* switch_name = is_guest ? (use_large ? switches::kAshDefaultGuestWallpaperLarge : |