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

chrome/browser/ui/views/extensions/extension_popup.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/ui/views/extensions/extension_popup.h"
 
 #include <vector>
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #endif
 
 using std::vector;
 using views::Widget;
@@ skipping 21 matching lines @@
       inspect_with_devtools_(inspect_with_devtools),
       close_on_lost_focus_(true),
       closing_(false),
       observer_(observer) {
   AddRef();  // Balanced in Close();
   set_delegate(this);
   host->view()->SetContainer(this);
 
   // We wait to show the popup until the contained host finishes loading.
   registrar_.Add(this,
-                 NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
+                 chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                  Source<Profile>(host->profile()));
 
   // Listen for the containing view calling window.close();
-  registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  Source<Profile>(host->profile()));
 }
 
 ExtensionPopup::~ExtensionPopup() {
 }
 
 void ExtensionPopup::Show(bool activate) {
   if (popup_->IsVisible())
     return;
 
@@ skipping 31 matching lines @@
   // because a subsequent event in this loop may also want to close this popup
   // and if so, we want to allow that. Example: Clicking the same browser
   // action button that opened the popup. If we closed immediately, the
   // browser action container would fail to discover that the same button
   // was pressed.
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(this,
       &ExtensionPopup::Close));
 }
 
 
-void ExtensionPopup::Observe(NotificationType type,
+void ExtensionPopup::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:
       // Once we receive did stop loading, the content will be complete and
       // the width will have been computed.  Now it's safe to show.
       if (extension_host_.get() == Details<ExtensionHost>(details).ptr()) {
         Show(true);
 
         if (inspect_with_devtools_) {
           // Listen for the the devtools window closing.
-          registrar_.Add(this, NotificationType::DEVTOOLS_WINDOW_CLOSING,
+          registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
               Source<Profile>(extension_host_->profile()));
           DevToolsWindow::ToggleDevToolsWindow(
               extension_host_->render_view_host(),
               DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
         }
       }
       break;
-    case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE:
+    case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
       if (Details<ExtensionHost>(host()) != details)
         return;
       Close();
 
       break;
-    case NotificationType::DEVTOOLS_WINDOW_CLOSING:
+    case content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING:
       // Make sure its the devtools window that inspecting our popup.
       if (Details<RenderViewHost>(extension_host_->render_view_host()) !=
           details)
         return;
 
       // If the devtools window is closing, we post a task to ourselves to
       // close the popup. This gives the devtools window a chance to finish
       // detaching from the inspected RenderViewHost.
       MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(this,
           &ExtensionPopup::Close));
@@ skipping 47 matching lines @@
   if (closing_)
     return;
   closing_ = true;
   DetachFromBrowser();
 
   if (observer_)
     observer_->ExtensionPopupIsClosing(this);
 
   Release();  // Balanced in ctor.
 }