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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1010443003: Make the lifetime of wallpaper manager more clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the failed unittests. Created 5 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 0556a2eeb97b98fb11fad8229069f67243d8d451..9bdf63f0bdbea9529412cb8e6bbb09045ee8eb1c 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -423,6 +423,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
// Add observers for WallpaperManager. This depends on PowerManagerClient,
// TimezoneSettings and CrosSettings.
+ WallpaperManager::Initialize();
WallpaperManager::Get()->AddObservers();
base::PostTaskAndReplyWithResult(
@@ -727,7 +728,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// that the UserManager has no URLRequest pending (see
// http://crbug.com/276659).
g_browser_process->platform_part()->user_manager()->Shutdown();
- WallpaperManager::Get()->Shutdown();
+ WallpaperManager::Shutdown();
// Let the DeviceDisablingManager unregister itself as an observer of the
// CrosSettings singleton before it is destroyed.
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698