| Index: chrome/browser/extensions/extension_infobar_delegate.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_infobar_delegate.cc (revision 91968)
|
| +++ chrome/browser/extensions/extension_infobar_delegate.cc (working copy)
|
| @@ -9,10 +9,10 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "content/common/notification_details.h"
|
| #include "content/common/notification_source.h"
|
| -#include "content/common/notification_type.h"
|
|
|
| ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(Browser* browser,
|
| TabContents* tab_contents,
|
| @@ -28,9 +28,9 @@
|
| extension_host_.reset(manager->CreateInfobarHost(url, browser));
|
| extension_host_->set_associated_tab_contents(tab_contents);
|
|
|
| - registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
|
| + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
|
| Source<Profile>(browser->profile()));
|
| - registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
|
| + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
|
| Source<Profile>(browser->profile()));
|
| }
|
|
|
| @@ -68,19 +68,19 @@
|
| return this;
|
| }
|
|
|
| -void ExtensionInfoBarDelegate::Observe(NotificationType type,
|
| +void ExtensionInfoBarDelegate::Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| TabContentsWrapper* wrapper =
|
| TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
|
| - switch (type.value) {
|
| - case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
|
| + switch (type) {
|
| + case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
|
| const ExtensionHost* result = Details<ExtensionHost>(details).ptr();
|
| if (extension_host_.get() == result)
|
| wrapper->RemoveInfoBar(this);
|
| break;
|
| }
|
| - case NotificationType::EXTENSION_UNLOADED: {
|
| + case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
|
| const Extension* extension =
|
| Details<UnloadedExtensionInfo>(details)->extension;
|
| if (extension_ == extension)
|
|
|