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 /chrome/browser/chromeos/extensions/wallpaper_private_api.cc | |
| 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 'chrome/browser/chromeos/extensions/wallpaper_private_api.cc')
| -rw-r--r-- | chrome/browser/chromeos/extensions/wallpaper_private_api.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 71eb832..a27d4b4 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()-> |