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

chrome/browser/tab_contents/background_contents.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/tab_contents/background_contents.h"
 
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/rect.h"
 
 ////////////////
 // BackgroundContents
 
 BackgroundContents::BackgroundContents(SiteInstance* site_instance,
                                        int routing_id,
                                        Delegate* delegate)
     : delegate_(delegate) {
   Profile* profile = site_instance->browsing_instance()->profile();
 
   // TODO(rafaelw): Implement correct session storage.
   render_view_host_ = new RenderViewHost(site_instance, this, routing_id, NULL);
 
   // Close ourselves when the application is shutting down.
-  registrar_.Add(this, NotificationType::APP_TERMINATING,
+  registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                  NotificationService::AllSources());
 
   // Register for our parent profile to shutdown, so we can shut ourselves down
   // as well (should only be called for OTR profiles, as we should receive
   // APP_TERMINATING before non-OTR profiles are destroyed).
-  registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
+  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                  Source<Profile>(profile));
 }
 
 // Exposed to allow creating mocks.
 BackgroundContents::BackgroundContents()
     : delegate_(NULL),
       render_view_host_(NULL) {
 }
 
 BackgroundContents::~BackgroundContents() {
   if (!render_view_host_)   // Will be null for unit tests.
     return;
   Profile* profile = render_view_host_->process()->profile();
   NotificationService::current()->Notify(
-      NotificationType::BACKGROUND_CONTENTS_DELETED,
+      chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
   render_view_host_->Shutdown();  // deletes render_view_host
 }
 
 BackgroundContents* BackgroundContents::GetAsBackgroundContents() {
   return this;
 }
 
 RenderViewHostDelegate::View* BackgroundContents::GetViewDelegate() {
@@ skipping 19 matching lines @@
   // navigation is limited to urls within the app's extent. This is enforced in
   // RenderView::decidePolicyForNaviation. If BackgroundContents become
   // available as a part of the web platform, it probably makes sense to have
   // some way to scope navigation of a background page to its opener's security
   // origin. Note: if the first navigation is to a URL outside the app's
   // extent a background page will be opened but will remain at about:blank.
   url_ = params.url;
 
   Profile* profile = render_view_host->process()->profile();
   NotificationService::current()->Notify(
-      NotificationType::BACKGROUND_CONTENTS_NAVIGATED,
+      chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
 }
 
 void BackgroundContents::RunJavaScriptMessage(
     const RenderViewHost* rvh,
     const string16& message,
     const string16& default_prompt,
     const GURL& frame_url,
     const int flags,
     IPC::Message* reply_msg,
     bool* did_suppress_message) {
   // TODO(rafaelw): Implement.
 
   // Since we are suppressing messages, just reply as if the user immediately
   // pressed "Cancel".
   OnDialogClosed(reply_msg, false, string16());
 
   *did_suppress_message = true;
 }
 
 bool BackgroundContents::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   return false;
 }
 
-void BackgroundContents::Observe(NotificationType type,
+void BackgroundContents::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   // TODO(rafaelw): Implement pagegroup ref-counting so that non-persistent
   // background pages are closed when the last referencing frame is closed.
-  switch (type.value) {
-    case NotificationType::PROFILE_DESTROYED:
-    case NotificationType::APP_TERMINATING: {
+  switch (type) {
+    case chrome::NOTIFICATION_PROFILE_DESTROYED:
+    case content::NOTIFICATION_APP_TERMINATING: {
       delete this;
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification sent.";
       break;
   }
 }
 
 void BackgroundContents::OnDialogClosed(IPC::Message* reply_msg,
@@ skipping 16 matching lines @@
 }
 
 void BackgroundContents::ClearInspectorSettings() {
   Profile* profile = render_view_host_->process()->profile();
   RenderViewHostDelegateHelper::ClearInspectorSettings(profile);
 }
 
 void BackgroundContents::Close(RenderViewHost* render_view_host) {
   Profile* profile = render_view_host->process()->profile();
   NotificationService::current()->Notify(
-      NotificationType::BACKGROUND_CONTENTS_CLOSED,
+      chrome::NOTIFICATION_BACKGROUND_CONTENTS_CLOSED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
   delete this;
 }
 
 void BackgroundContents::RenderViewGone(RenderViewHost* rvh,
                                         base::TerminationStatus status,
                                         int error_code) {
   Profile* profile = rvh->process()->profile();
   NotificationService::current()->Notify(
-      NotificationType::BACKGROUND_CONTENTS_TERMINATED,
+      chrome::NOTIFICATION_BACKGROUND_CONTENTS_TERMINATED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
 
   // Our RenderView went away, so we should go away also, so killing the process
   // via the TaskManager doesn't permanently leave a BackgroundContents hanging
   // around the system, blocking future instances from being created
   // (http://crbug.com/65189).
   delete this;
 }
 
@@ skipping 57 matching lines @@
 BackgroundContents*
 BackgroundContents::GetBackgroundContentsByID(int render_process_id,
                                               int render_view_id) {
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
   if (!render_view_host)
     return NULL;
 
   return render_view_host->delegate()->GetAsBackgroundContents();
 }