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

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_private_api.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/desktop_background/desktop_background_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/wallpaper_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index 71eb8323e800c3863823280de7bdf21d05994353..a27d4b45504c247b0c29ae5eab45f0599aca9e1e 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -57,9 +57,7 @@ const char kWallpaperManifestBaseURL[] = "https://commondatastorage.googleapis."
bool IsOEMDefaultWallpaper() {
return CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAshDefaultWallpaperIsOem) ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAshOemWallpaperSmall);
+ ash::switches::kAshDefaultWallpaperIsOem);
}
// Saves |data| as |file_name| to directory with |key|. Return false if the
@@ -622,12 +620,8 @@ bool WallpaperPrivateGetThumbnailFunction::RunImpl() {
// TODO(bshe): Small resolution wallpaper is used here as wallpaper
// thumbnail. We should either resize it or include a wallpaper thumbnail in
// addition to large and small wallpaper resolutions.
- thumbnail_path = CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAshDefaultWallpaperIsOem) ?
- CommandLine::ForCurrentProcess()->GetSwitchValuePath(
- ash::switches::kAshDefaultWallpaperSmall) :
- CommandLine::ForCurrentProcess()->GetSwitchValuePath(
- ash::switches::kAshOemWallpaperSmall);
+ thumbnail_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+ ash::switches::kAshDefaultWallpaperSmall);
}
sequence_token_ = BrowserThread::GetBlockingPool()->
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698