diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 19:41:00 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 19:41:00 +0000 |
| commit | 9f54d10830ab9795f0e8e6ab898d94bdacedba8d (patch) | |
| tree | fa7d8c5e40f8232cf78cf490f486b1cab141ec74 /ash/shell | |
| parent | 55d0dad62cbe911e571f556d2e54ba4caa99ec2b (diff) | |
| download | chromium_src-9f54d10830ab9795f0e8e6ab898d94bdacedba8d.zip chromium_src-9f54d10830ab9795f0e8e6ab898d94bdacedba8d.tar.gz chromium_src-9f54d10830ab9795f0e8e6ab898d94bdacedba8d.tar.bz2 | |
ash: Add flags for specifying default wallpaper.
This adds new command-line flags for specifying image files
that will be used as default wallpaper:
--ash-default-guest-wallpaper-large
--ash-default-guest-wallpaper-small
--ash-default-wallpaper-large
--ash-default-wallpaper-small
This makes it easier for Chrome OS to have per-device custom
wallpaper. (We previously loaded the default wallpaper from
a resource file, but that prevents the same build of Chrome
from being used on different devices.)
BUG=248764
Review URL: https://chromiumcodereview.appspot.com/16982006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 03a401c..968cdd4 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -132,12 +132,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { ash::shell::InitWindowTypeLauncher(); - DesktopBackgroundController* controller = - Shell::GetInstance()->desktop_background_controller(); - if (controller->GetAppropriateResolution() == WALLPAPER_RESOLUTION_LARGE) - controller->SetDefaultWallpaper(kDefaultLargeWallpaper); - else - controller->SetDefaultWallpaper(kDefaultSmallWallpaper); + Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper( + false /* is_guest */); ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); } |