diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
| commit | 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch) | |
| tree | a75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/ui/cocoa/browser_window_cocoa.h | |
| parent | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff) | |
| download | chromium_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/ui/cocoa/browser_window_cocoa.h')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_cocoa.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 7d2ba5f..7f60a7a 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -11,7 +11,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/ui/browser_window.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" #include "ui/base/ui_base_types.h" class Browser; @@ -26,7 +26,7 @@ class Browser; // it needs to manipulate the window. class BrowserWindowCocoa : public BrowserWindow, - public NotificationObserver { + public content::NotificationObserver { public: BrowserWindowCocoa(Browser* browser, BrowserWindowController* controller); @@ -126,8 +126,8 @@ class BrowserWindowCocoa : public BrowserWindow, // Overridden from NotificationObserver virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Adds the given FindBar cocoa controller to this browser window. void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); @@ -142,7 +142,7 @@ class BrowserWindowCocoa : public BrowserWindow, NSWindow* window() const; // Accessor for the (current) |NSWindow|. void UpdateSidebarForContents(TabContents* tab_contents); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; PrefChangeRegistrar pref_change_registrar_; Browser* browser_; // weak, owned by controller BrowserWindowController* controller_; // weak, owns us |