diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 02:58:35 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 02:58:35 +0000 |
| commit | 6a5fe3a5529ddcc9e0a9029231f2912dd588631d (patch) | |
| tree | a2d0b17a59164fecc8cda8292ee98396b88caa46 /ash/desktop_background | |
| parent | d7acb7c69791e655ec643444f884064fe8019a15 (diff) | |
| download | chromium_src-6a5fe3a5529ddcc9e0a9029231f2912dd588631d.zip chromium_src-6a5fe3a5529ddcc9e0a9029231f2912dd588631d.tar.gz chromium_src-6a5fe3a5529ddcc9e0a9029231f2912dd588631d.tar.bz2 | |
ash: Rename guest wallpaper flags.
Rename --ash-default-guest-wallpaper-{large,small} to
--ash-guest-wallpaper-{large,small}
(session_manager_setup.sh is currently passing both the old
and new flags). "Default" doesn't make sense here since
guest wallpapers aren't user-configurable.
BUG=298389
Review URL: https://codereview.chromium.org/25329002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller.cc | 4 | ||||
| -rw-r--r-- | ash/desktop_background/desktop_background_controller_unittest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index b7af42e..180f008 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -229,8 +229,8 @@ bool DesktopBackgroundController::SetDefaultWallpaper(bool is_guest) { command_line_for_testing_ : CommandLine::ForCurrentProcess(); const char* switch_name = NULL; if (is_guest) { - switch_name = use_large ? switches::kAshDefaultGuestWallpaperLarge : - switches::kAshDefaultGuestWallpaperSmall; + switch_name = use_large ? switches::kAshGuestWallpaperLarge : + switches::kAshGuestWallpaperSmall; } else { const char* oem_switch_name = use_large ? switches::kAshOemWallpaperLarge : switches::kAshOemWallpaperSmall; diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 5e4a2ea..4d91949 100644 --- a/ash/desktop_background/desktop_background_controller_unittest.cc +++ b/ash/desktop_background/desktop_background_controller_unittest.cc @@ -236,14 +236,14 @@ class DesktopBackgroundControllerTest : public test::AshTestBase { ASSERT_TRUE(WriteJPEGFile(kLargeGuestPath, kWallpaperSize, kWallpaperSize, kLargeGuestWallpaperColor)); command_line_.AppendSwitchPath( - switches::kAshDefaultGuestWallpaperLarge, kLargeGuestPath); + switches::kAshGuestWallpaperLarge, kLargeGuestPath); const base::FilePath kSmallGuestPath = wallpaper_dir_->path().Append(FILE_PATH_LITERAL("guest_small.jpg")); ASSERT_TRUE(WriteJPEGFile(kSmallGuestPath, kWallpaperSize, kWallpaperSize, kSmallGuestWallpaperColor)); command_line_.AppendSwitchPath( - switches::kAshDefaultGuestWallpaperSmall, kSmallGuestPath); + switches::kAshGuestWallpaperSmall, kSmallGuestPath); controller_->set_command_line_for_testing(&command_line_); } |