ash/shell/content_client/shell_browser_main_parts.cc - Issue 17502005: Revert r207560 and r207566 to reland r207511.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: add more SupportsMultipleDisplays checks 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:

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();

}