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

Side by Side Diff: chrome/browser/chromeos/login/wallpaper_manager.h

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/memory/ref_counted_memory.h" 12 #include "base/memory/ref_counted_memory.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/threading/sequenced_worker_pool.h" 14 #include "base/threading/sequenced_worker_pool.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/timer.h" 16 #include "base/timer.h"
17 #include "chrome/browser/chromeos/login/user.h" 17 #include "chrome/browser/chromeos/login/user.h"
18 #include "chrome/browser/chromeos/login/user_image.h" 18 #include "chrome/browser/chromeos/login/user_image.h"
19 #include "chrome/browser/chromeos/login/user_image_loader.h" 19 #include "chrome/browser/chromeos/login/user_image_loader.h"
20 #include "chrome/browser/chromeos/system/timezone_settings.h" 20 #include "chrome/browser/chromeos/system/timezone_settings.h"
21 #include "chromeos/dbus/power_manager_client.h" 21 #include "chromeos/dbus/power_manager_client.h"
22 #include "content/public/browser/notification_observer.h" 22 #include "content/public/browser/notification_observer.h"
23 #include "content/public/browser/notification_registrar.h" 23 #include "content/public/browser/notification_registrar.h"
24 #include "third_party/icu/public/i18n/unicode/timezone.h" 24 #include "third_party/icu/public/i18n/unicode/timezone.h"
25 #include "ui/gfx/image/image_skia.h" 25 #include "ui/gfx/image/image_skia.h"
26 26
27 class PrefServiceSimple; 27 class PrefRegistrySimple;
28 28
29 namespace base { 29 namespace base {
30 class SequencedTaskRunner; 30 class SequencedTaskRunner;
31 } 31 }
32 32
33 namespace chromeos { 33 namespace chromeos {
34 34
35 struct WallpaperInfo { 35 struct WallpaperInfo {
36 // Online wallpaper URL or file name of migrated wallpaper. 36 // Online wallpaper URL or file name of migrated wallpaper.
37 std::string file; 37 std::string file;
(...skipping 25 matching lines...) Expand all
63 static WallpaperManager* Get(); 63 static WallpaperManager* Get();
64 64
65 WallpaperManager(); 65 WallpaperManager();
66 virtual ~WallpaperManager(); 66 virtual ~WallpaperManager();
67 67
68 // Indicates imminent shutdown, allowing the WallpaperManager to remove any 68 // Indicates imminent shutdown, allowing the WallpaperManager to remove any
69 // observers it has registered. 69 // observers it has registered.
70 void Shutdown(); 70 void Shutdown();
71 71
72 // Registers wallpaper manager preferences. 72 // Registers wallpaper manager preferences.
73 static void RegisterPrefs(PrefServiceSimple* local_state); 73 static void RegisterPrefs(PrefRegistrySimple* registry);
74 74
75 // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers. 75 // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers.
76 void AddObservers(); 76 void AddObservers();
77 77
78 // Loads wallpaper asynchronously if the current wallpaper is not the 78 // Loads wallpaper asynchronously if the current wallpaper is not the
79 // wallpaper of logged in user. 79 // wallpaper of logged in user.
80 void EnsureLoggedInUserWallpaperLoaded(); 80 void EnsureLoggedInUserWallpaperLoaded();
81 81
82 // Clears ONLINE and CUSTOM wallpaper cache. 82 // Clears ONLINE and CUSTOM wallpaper cache.
83 void ClearWallpaperCache(); 83 void ClearWallpaperCache();
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 content::NotificationRegistrar registrar_; 292 content::NotificationRegistrar registrar_;
293 293
294 base::OneShotTimer<WallpaperManager> timer_; 294 base::OneShotTimer<WallpaperManager> timer_;
295 295
296 DISALLOW_COPY_AND_ASSIGN(WallpaperManager); 296 DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
297 }; 297 };
298 298
299 } // namespace chromeos 299 } // namespace chromeos
300 300
301 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 301 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_unittest.cc ('k') | chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698