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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 17502005: Revert r207560 and r207566 to reland r207511. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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
« ash/desktop_background/desktop_background_controller_unittest.cc ('K') | « ash/desktop_background/wallpaper_resizer_unittest.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content_client/shell_browser_main_parts.cc
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index 03a401cfb928d4044423bd5447e28ddffe5a296f..968cdd4222d8353bab8a42f79e2375e175c278ac 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();
}
« ash/desktop_background/desktop_background_controller_unittest.cc ('K') | « ash/desktop_background/wallpaper_resizer_unittest.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698