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

Unified Diff: chrome/browser/content_settings/content_settings_policy_provider.h

Issue 11345008: Remove content::NotificationObserver dependency from most Prefs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit Created 8 years, 1 month 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/content_settings/content_settings_policy_provider.h
diff --git a/chrome/browser/content_settings/content_settings_policy_provider.h b/chrome/browser/content_settings/content_settings_policy_provider.h
index 586a4d40026523473d612096f2bb46753beed575..096c09b9fa254a5457a46c1dcdaffe4148c3918b 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider.h
+++ b/chrome/browser/content_settings/content_settings_policy_provider.h
@@ -11,10 +11,10 @@
#include "base/basictypes.h"
#include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
#include "base/synchronization/lock.h"
#include "chrome/browser/content_settings/content_settings_observable_provider.h"
#include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
-#include "content/public/browser/notification_observer.h"
class PrefService;
@@ -22,7 +22,7 @@ namespace content_settings {
// PolicyProvider that provides managed content-settings.
class PolicyProvider : public ObservableProvider,
- public content::NotificationObserver {
+ public PrefObserver {
public:
explicit PolicyProvider(PrefService* prefs);
virtual ~PolicyProvider();
@@ -46,10 +46,10 @@ class PolicyProvider : public ObservableProvider,
virtual void ShutdownOnUIThread() OVERRIDE;
- // content::NotificationObserver implementation.
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ // PrefObserver implementation.
+ virtual void OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& pref_name) OVERRIDE;
+
private:
// Reads the policy managed default settings.
void ReadManagedDefaultSettings();

Powered by Google App Engine
This is Rietveld 408576698