diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 23:12:12 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 23:12:12 +0000 |
| commit | 2c42f0e0813fbcd9ae15953f552e3483f95c57ac (patch) | |
| tree | 911c82e7877fe962bf9d52ce90bae1a2f5d425b6 /chrome | |
| parent | a43ed7df31cab0e28f7d67a94f1b4936359dc8f6 (diff) | |
| download | chromium_src-2c42f0e0813fbcd9ae15953f552e3483f95c57ac.zip chromium_src-2c42f0e0813fbcd9ae15953f552e3483f95c57ac.tar.gz chromium_src-2c42f0e0813fbcd9ae15953f552e3483f95c57ac.tar.bz2 | |
Use a NotificationRegistrar to listen for notifications.
BUG=2381
TBR=avi
Review URL: http://codereview.chromium.org/113796
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.h | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.mm | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h index 2e1e919..4cec480 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.h +++ b/chrome/browser/cocoa/browser_window_cocoa.h @@ -7,6 +7,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/common/notification_registrar.h" class Browser; @class BrowserWindowController; @@ -81,6 +82,7 @@ class BrowserWindowCocoa : public BrowserWindow, virtual void DestroyBrowser(); private: + NotificationRegistrar registrar_; NSWindow* window_; // weak, owned by controller Browser* browser_; // weak, owned by controller BrowserWindowController* controller_; // weak, owns us diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 0e471fc..95e61f1 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -19,16 +19,12 @@ BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, NSWindow* window) : window_(window), browser_(browser), controller_(controller) { // This pref applies to all windows, so all must watch for it. - NotificationService* ns = NotificationService::current(); - ns->AddObserver(this, NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, - NotificationService::AllSources()); + registrar_.AddObserver(this, + NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, + NotificationService::AllSources()); } BrowserWindowCocoa::~BrowserWindowCocoa() { - NotificationService* ns = NotificationService::current(); - ns->RemoveObserver(this, - NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, - NotificationService::AllSources()); } void BrowserWindowCocoa::Show() { |