summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/util/extensions_activity_monitor.cc
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/sync/util/extensions_activity_monitor.cc
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/sync/util/extensions_activity_monitor.cc')
-rw-r--r--chrome/browser/sync/util/extensions_activity_monitor.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc
index d00a0b4..6a7cdcf 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor.cc
@@ -20,7 +20,7 @@ namespace {
class RegistrationTask : public Task {
public:
RegistrationTask(ExtensionsActivityMonitor* monitor,
- NotificationRegistrar* registrar)
+ content::NotificationRegistrar* registrar)
: monitor_(monitor), registrar_(registrar) {}
virtual ~RegistrationTask() {}
@@ -39,7 +39,7 @@ class RegistrationTask : public Task {
private:
ExtensionsActivityMonitor* monitor_;
- NotificationRegistrar* registrar_;
+ content::NotificationRegistrar* registrar_;
DISALLOW_COPY_AND_ASSIGN(RegistrationTask);
};
} // namespace
@@ -80,13 +80,15 @@ void ExtensionsActivityMonitor::PutRecords(const Records& records) {
}
}
-void ExtensionsActivityMonitor::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void ExtensionsActivityMonitor::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
base::AutoLock lock(records_lock_);
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- const Extension* extension = Source<const Extension>(source).ptr();
- const BookmarksFunction* f = Details<const BookmarksFunction>(details).ptr();
+ const Extension* extension = content::Source<const Extension>(source).ptr();
+ const BookmarksFunction* f =
+ content::Details<const BookmarksFunction>(details).ptr();
if (f->name() == "bookmarks.update" ||
f->name() == "bookmarks.move" ||
f->name() == "bookmarks.create" ||