Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 68513005: ash: Remove old OEM wallpaper flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash_switches.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_controller.cc
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 555739830674766c2501a181366f6f8a210e569c..2f4e6334ff3f250a068c535943cca452c49d5c6d 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);
« no previous file with comments | « ash/ash_switches.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698