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

Unified Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.h

Issue 10692110: screenshot disabling policy (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed comments Created 8 years, 5 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/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_;

Powered by Google App Engine
This is Rietveld 408576698