diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
| commit | 43211582b1fa8c69136385250e7b0446cf364b5c (patch) | |
| tree | 655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm | |
| parent | d43970a7ceee5fc5433787b0f28b64234a4039f2 (diff) | |
| download | chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.zip chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.gz chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.bz2 | |
Moving notification types which are chrome specific to a new header file chrome_notification_types.h.
This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END
which defines the end of the enum used by content to define notification types. The notificaton_type.h file
in content\common has been renamed to content_notification_types.h
BUG=76698
Review URL: http://codereview.chromium.org/7327007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 8a68fe7..7044bcc 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -44,12 +44,12 @@ #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/browser/upgrade_detector.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_details.h" #include "content/common/notification_observer.h" #include "content/common/notification_service.h" -#include "content/common/notification_type.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -123,19 +123,19 @@ class NotificationBridge : public NotificationObserver { public: explicit NotificationBridge(ToolbarController* controller) : controller_(controller) { - registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED, + registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED, NotificationService::AllSources()); } // Overridden from NotificationObserver: - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::PREF_CHANGED: + switch (type) { + case chrome::NOTIFICATION_PREF_CHANGED: [controller_ prefChanged:Details<std::string>(details).ptr()]; break; - case NotificationType::UPGRADE_RECOMMENDED: + case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: [controller_ badgeWrenchMenuIfNeeded]; break; default: |