diff options
| author | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 21:05:05 +0000 |
|---|---|---|
| committer | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 21:05:05 +0000 |
| commit | b27eb51b1e856d23e95fffcf123e0ee88879166f (patch) | |
| tree | ada2e7fa212020963e154e08eda1a35e1c264367 /ash/shell/content_client | |
| parent | 851ff2405c95258dea29a91d489d10eae7696be7 (diff) | |
| download | chromium_src-b27eb51b1e856d23e95fffcf123e0ee88879166f.zip chromium_src-b27eb51b1e856d23e95fffcf123e0ee88879166f.tar.gz chromium_src-b27eb51b1e856d23e95fffcf123e0ee88879166f.tar.bz2 | |
Revert 207511 "ash: Add flags for specifying default wallpaper."
Failed ash_unittests on WinAura
> 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
TBR=derat@chromium.org
Review URL: https://codereview.chromium.org/17094012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/content_client')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 968cdd4..03a401c 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -132,8 +132,12 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { ash::shell::InitWindowTypeLauncher(); - Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper( - false /* is_guest */); + DesktopBackgroundController* controller = + Shell::GetInstance()->desktop_background_controller(); + if (controller->GetAppropriateResolution() == WALLPAPER_RESOLUTION_LARGE) + controller->SetDefaultWallpaper(kDefaultLargeWallpaper); + else + controller->SetDefaultWallpaper(kDefaultSmallWallpaper); ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); } |