summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 15:52:27 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 15:52:27 +0000
commit43211582b1fa8c69136385250e7b0446cf364b5c (patch)
tree655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
parentd43970a7ceee5fc5433787b0f28b64234a4039f2 (diff)
downloadchromium_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/extensions/extension_popup_controller.mm')
-rw-r--r--chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm13
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 65fda6a..17899e5 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -13,6 +13,7 @@
#import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
#import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
#import "chrome/browser/ui/cocoa/info_bubble_window.h"
+#include "chrome/common/chrome_notification_types.h"
#include "content/browser/debugger/devtools_window.h"
#include "content/common/notification_details.h"
#include "content/common/notification_registrar.h"
@@ -38,16 +39,16 @@ class DevtoolsNotificationBridge : public NotificationObserver {
explicit DevtoolsNotificationBridge(ExtensionPopupController* controller)
: controller_(controller) {}
- void Observe(NotificationType type,
+ void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- switch (type.value) {
- case NotificationType::EXTENSION_HOST_DID_STOP_LOADING: {
+ switch (type) {
+ case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
if (Details<ExtensionHost>([controller_ extensionHost]) == details)
[controller_ showDevTools];
break;
}
- case NotificationType::DEVTOOLS_WINDOW_CLOSING: {
+ case content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING: {
RenderViewHost* rvh = [controller_ extensionHost]->render_view_host();
if (Details<RenderViewHost>(rvh) == details)
// Allow the devtools to finish detaching before we close the popup
@@ -131,10 +132,10 @@ class DevtoolsNotificationBridge : public NotificationObserver {
notificationBridge_.reset(new DevtoolsNotificationBridge(self));
registrar_.reset(new NotificationRegistrar);
registrar_->Add(notificationBridge_.get(),
- NotificationType::DEVTOOLS_WINDOW_CLOSING,
+ chrome::DEVTOOLS_WINDOW_CLOSING,
Source<Profile>(host->profile()));
registrar_->Add(notificationBridge_.get(),
- NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
+ chrome::EXTENSION_HOST_DID_STOP_LOADING,
Source<Profile>(host->profile()));
}
return self;