Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/extensions/extension_disabled_infobar_delegate.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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"
 #include "content/common/notification_details.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // ExtensionDisabledDialogDelegate --------------------------------------------
@@ skipping 65 matching lines @@
  private:
   virtual ~ExtensionDisabledInfobarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   NotificationRegistrar registrar_;
   TabContentsWrapper* tab_contents_;
   ExtensionService* service_;
   const Extension* extension_;
 };
 
 ExtensionDisabledInfobarDelegate::ExtensionDisabledInfobarDelegate(
     TabContentsWrapper* tab_contents,
     ExtensionService* service,
     const Extension* extension)
     : ConfirmInfoBarDelegate(tab_contents->tab_contents()),
       tab_contents_(tab_contents),
       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()));
 }
 
 ExtensionDisabledInfobarDelegate::~ExtensionDisabledInfobarDelegate() {
 }
 
 string16 ExtensionDisabledInfobarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(extension_->is_app() ?
       IDS_APP_DISABLED_INFOBAR_LABEL : IDS_EXTENSION_DISABLED_INFOBAR_LABEL,
       UTF8ToUTF16(extension_->name()));
@@ skipping 11 matching lines @@
 }
 
 bool ExtensionDisabledInfobarDelegate::Accept() {
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(tab_contents_->profile(), service_,
                                       extension_);
   return true;
 }
 
 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)
       extension = info->extension;
   }
   if (extension == extension_)
     tab_contents_->RemoveInfoBar(this);
 }
 
 
@@ skipping 11 matching lines @@
 
   tab_contents->AddInfoBar(new ExtensionDisabledInfobarDelegate(
       tab_contents, service, extension));
 }
 
 void ShowExtensionDisabledDialog(ExtensionService* service, Profile* profile,
                                  const Extension* extension) {
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(profile, service, extension);
 }