| Index: chrome/browser/extensions/extension_disabled_infobar_delegate.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_disabled_infobar_delegate.cc (revision 91968)
|
| +++ chrome/browser/extensions/extension_disabled_infobar_delegate.cc (working copy)
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/extensions/extension_file_util.h"
|
| #include "chrome/common/extensions/extension_resource.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| @@ -97,7 +98,7 @@
|
| virtual bool Accept() OVERRIDE;
|
|
|
| // NotificationObserver:
|
| - virtual void Observe(NotificationType type,
|
| + virtual void Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) OVERRIDE;
|
|
|
| @@ -116,9 +117,9 @@
|
| service_(service),
|
| extension_(extension) {
|
| // The user might re-enable the extension in other ways, so watch for that.
|
| - registrar_.Add(this, NotificationType::EXTENSION_LOADED,
|
| + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
|
| Source<Profile>(service->profile()));
|
| - registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
|
| + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
|
| Source<Profile>(service->profile()));
|
| }
|
|
|
| @@ -150,16 +151,16 @@
|
| }
|
|
|
| void ExtensionDisabledInfobarDelegate::Observe(
|
| - NotificationType type,
|
| + int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| // TODO(mpcomplete): RemoveInfoBar doesn't seem to always result in us getting
|
| // deleted.
|
| const Extension* extension = NULL;
|
| - if (type.value == NotificationType::EXTENSION_LOADED) {
|
| + if (type == chrome::NOTIFICATION_EXTENSION_LOADED) {
|
| extension = Details<const Extension>(details).ptr();
|
| } else {
|
| - DCHECK_EQ(NotificationType::EXTENSION_UNLOADED, type.value);
|
| + DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNLOADED, type);
|
| UnloadedExtensionInfo* info = Details<UnloadedExtensionInfo>(details).ptr();
|
| if (info->reason == UnloadedExtensionInfo::DISABLE ||
|
| info->reason == UnloadedExtensionInfo::UNINSTALL)
|
|
|