Chromium Code Reviews| Index: chrome/browser/ui/views/ash/chrome_shell_delegate.h |
| diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.h b/chrome/browser/ui/views/ash/chrome_shell_delegate.h |
| index 50a9737dec886c48a478f0d18f22f57e5281d8c7..7070debfe8670b31b3cea9f3744f20f9be48e61b 100644 |
| --- a/chrome/browser/ui/views/ash/chrome_shell_delegate.h |
| +++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.h |
| @@ -11,9 +11,11 @@ |
| #include "base/basictypes.h" |
| #include "base/compiler_specific.h" |
| #include "base/memory/scoped_ptr.h" |
| +#include "chrome/browser/prefs/pref_change_registrar.h" |
| #include "content/public/browser/notification_observer.h" |
| #include "content/public/browser/notification_registrar.h" |
| +class PrefService; |
| class WindowPositioner; |
| namespace views { |
| @@ -30,6 +32,13 @@ class ChromeShellDelegate : public ash::ShellDelegate, |
| WindowPositioner* window_positioner() { return window_positioner_.get(); } |
| +#if defined(OS_CHROMEOS) |
| + // This is used for registering both local state and user prefs. |
|
Mattias Nissler (ping if slow)
2012/07/09 09:30:12
That comment doesn't seem very helpful as the func
qfel
2012/07/11 12:34:49
At the beginning there was one method that was sup
|
| + static void RegisterLocalPrefs(PrefService* service); |
| + static void RegisterUserPrefs(PrefService* service); |
| + void UpdateScreenshotDelegate(); |
| +#endif |
| + |
| // ash::ShellDelegate overrides; |
| virtual bool IsUserLoggedIn() OVERRIDE; |
| virtual void LockScreen() OVERRIDE; |
| @@ -67,7 +76,10 @@ class ChromeShellDelegate : public ash::ShellDelegate, |
| private: |
| static ChromeShellDelegate* instance_; |
| +#if defined(OS_CHROMEOS) |
| content::NotificationRegistrar registrar_; |
| + PrefChangeRegistrar pref_registrar_; |
| +#endif |
| scoped_ptr<WindowPositioner> window_positioner_; |