diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 08:21:21 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 08:21:21 +0000 |
| commit | 1ad3d20858c13b6448c27e03c48c1a2157ce2127 (patch) | |
| tree | af8e84b8c1d0481dba9e4d9317a184611df1a187 /ash/desktop_background | |
| parent | f9534ce300cc27c90f64087e864993130b3b13fa (diff) | |
| download | chromium_src-1ad3d20858c13b6448c27e03c48c1a2157ce2127.zip chromium_src-1ad3d20858c13b6448c27e03c48c1a2157ce2127.tar.gz chromium_src-1ad3d20858c13b6448c27e03c48c1a2157ce2127.tar.bz2 | |
ash: Remove old OEM wallpaper flags.
Remove --ash-oem-wallpaper-large and
--ash-oem-wallpaper-small. OEM wallpapers are now passed via
the --ash-default-wallpaper-{large,small} switches in
conjunction with the --ash-default-wallpaper-is-oem flag.
BUG=315267
Review URL: https://codereview.chromium.org/68513005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index 5557398..2f4e633 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -224,13 +224,8 @@ bool DesktopBackgroundController::SetDefaultWallpaper(bool is_guest) { switch_name = use_large ? switches::kAshGuestWallpaperLarge : switches::kAshGuestWallpaperSmall; } else { - const char* oem_switch_name = use_large ? switches::kAshOemWallpaperLarge : - switches::kAshOemWallpaperSmall; - const char* default_switch_name = use_large ? - switches::kAshDefaultWallpaperLarge : + switch_name = use_large ? switches::kAshDefaultWallpaperLarge : switches::kAshDefaultWallpaperSmall; - switch_name = command_line->HasSwitch(oem_switch_name) ? oem_switch_name : - default_switch_name; } file_path = command_line->GetSwitchValuePath(switch_name); |