ash/shell/content_client/shell_browser_main_parts.cc - Issue 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager.

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 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Do not reuse RunLoop object. Created 6 years, 8 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

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 7a745c6b833e3f92e756f3d833736edaacf4bde7..02017e62d673f71e97f191ce7ea75e31104e6b73 100644

--- a/ash/shell/content_client/shell_browser_main_parts.cc

+++ b/ash/shell/content_client/shell_browser_main_parts.cc

@@ -37,6 +37,7 @@

#endif

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/login/wallpaper_manager.h"

Nikita (slow) 2014/04/09 08:51:41 ash/ should not depend on chrome/browser/ You sho

#include "chromeos/audio/cras_audio_handler.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#endif

@@ -134,8 +135,10 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {

ash::shell::InitWindowTypeLauncher();

- Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper(

- false /* is_guest */);

+#if defined(OS_CHROMEOS)

+ chromeos::WallpaperManager::Get()->

+ SetDefaultWallpaperDelayed(chromeos::UserManager::kSignInUser);

+#endif

ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();

}

« no previous file with comments | « ash/desktop_background/wallpaper_resizer.cc ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »