diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 17:17:38 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 17:17:38 +0000 |
| commit | 0c3461ab36efb7744df197f7029d66c3170a61f3 (patch) | |
| tree | 5c11004cd470a1f028548e9139738d9cd7c528fb /ash/shell | |
| parent | 2dca2dc97fd303df0c6a1fb11828472ef1c00428 (diff) | |
| download | chromium_src-0c3461ab36efb7744df197f7029d66c3170a61f3.zip chromium_src-0c3461ab36efb7744df197f7029d66c3170a61f3.tar.gz chromium_src-0c3461ab36efb7744df197f7029d66c3170a61f3.tar.bz2 | |
Remove use of index in wallpaper picker code and some refactor
BUG=141431
Review URL: https://codereview.chromium.org/11415015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 872f352..a3f5c8d 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -102,7 +102,12 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { ash::shell::InitWindowTypeLauncher(); - Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper(0); + DesktopBackgroundController* controller = + Shell::GetInstance()->desktop_background_controller(); + if (controller->GetAppropriateResolution() == WALLPAPER_RESOLUTION_LARGE) + controller->SetDefaultWallpaper(kDefaultLargeWallpaper); + else + controller->SetDefaultWallpaper(kDefaultSmallWallpaper); ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); } |