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

Unified Diff: chrome/browser/chromeos/login/wallpaper_manager.h

Issue 11968044: Fix login visual hitch on chromebook (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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: chrome/browser/chromeos/login/wallpaper_manager.h
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h
index 7e6c375852630e83ba564f1d48306bad56a1bb4d..32130872533781aeb35c6bf04b32c90288418be1 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/wallpaper_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -63,14 +63,15 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
static WallpaperManager* Get();
WallpaperManager();
+ virtual ~WallpaperManager();
+
+ // Indicates imminent shutdown, allowing the WallpaperManager to remove any
+ // observers it has registered.
+ void Shutdown();
// Registers wallpaper manager preferences.
static void RegisterPrefs(PrefServiceSimple* local_state);
- // Adds PowerManagerClient and TimeZoneSettings observers. It needs to be
- // added after PowerManagerClient has been initialized.
- void AddObservers();
-
// Loads wallpaper asynchronously if the current wallpaper is not the
// wallpaper of logged in user.
void EnsureLoggedInUserWallpaperLoaded();
@@ -158,8 +159,6 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
friend class WallpaperManagerBrowserTest;
typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
- virtual ~WallpaperManager();
-
// The number of wallpapers have loaded. For test only.
int loaded_wallpapers() const { return loaded_wallpapers_; }
@@ -267,6 +266,9 @@ class WallpaperManager: public system::TimezoneSettings::Observer,
bool update_wallpaper,
const FilePath& wallpaper_path);
+ // True if Shutdown function get called.
+ bool called_shutdown_;
+
// The number of loaded wallpapers.
int loaded_wallpapers_;

Powered by Google App Engine
This is Rietveld 408576698