summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_set_observer.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
commit6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch)
treea75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/prefs/pref_set_observer.h
parentbf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff)
downloadchromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header. BUG=98716 TBR=joi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_set_observer.h')
-rw-r--r--chrome/browser/prefs/pref_set_observer.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/prefs/pref_set_observer.h b/chrome/browser/prefs/pref_set_observer.h
index 2639462..557bd83 100644
--- a/chrome/browser/prefs/pref_set_observer.h
+++ b/chrome/browser/prefs/pref_set_observer.h
@@ -11,15 +11,15 @@
#include "base/basictypes.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "content/common/notification_observer.h"
+#include "content/public/browser/notification_observer.h"
// Observes the state of a set of preferences and allows to query their combined
// managed bits.
-class PrefSetObserver : public NotificationObserver {
+class PrefSetObserver : public content::NotificationObserver {
public:
// Initialize with an empty set of preferences.
PrefSetObserver(PrefService* pref_service,
- NotificationObserver* observer);
+ content::NotificationObserver* observer);
virtual ~PrefSetObserver();
// Add a |pref| to the set of preferences to observe.
@@ -35,25 +35,25 @@ class PrefSetObserver : public NotificationObserver {
// Create a pref set observer for all preferences relevant to proxies.
static PrefSetObserver* CreateProxyPrefSetObserver(
PrefService* pref_service,
- NotificationObserver* observer);
+ content::NotificationObserver* observer);
// Create a pref set observer for all preferences relevant to default search.
static PrefSetObserver* CreateDefaultSearchPrefSetObserver(
PrefService* pref_service,
- NotificationObserver* observer);
+ content::NotificationObserver* observer);
private:
- // Overridden from NotificationObserver.
+ // Overridden from content::NotificationObserver.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
typedef std::set<std::string> PrefSet;
PrefSet prefs_;
PrefService* pref_service_;
PrefChangeRegistrar registrar_;
- NotificationObserver* observer_;
+ content::NotificationObserver* observer_;
DISALLOW_COPY_AND_ASSIGN(PrefSetObserver);
};