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

chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 
 @interface TabContentsController(Private)
 // Forwards frame update to |delegate_| (ResizeNotificationView calls it).
 - (void)tabContentsViewFrameWillChange:(NSRect)frameRect;
 // Notification from TabContents (forwarded by TabContentsNotificationBridge).
 - (void)tabContentsRenderViewHostChanged:(RenderViewHost*)oldHost
                                  newHost:(RenderViewHost*)newHost;
 @end
 
 
 // A supporting C++ bridge object to register for TabContents notifications.
 
 class TabContentsNotificationBridge : public NotificationObserver {
  public:
   explicit TabContentsNotificationBridge(TabContentsController* controller);
 
   // Overriden from NotificationObserver.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
   // Register for |contents|'s notifications, remove all prior registrations.
   void ChangeTabContents(TabContents* contents);
  private:
   NotificationRegistrar registrar_;
   TabContentsController* controller_;  // weak, owns us
 };
 
 TabContentsNotificationBridge::TabContentsNotificationBridge(
     TabContentsController* controller)
     : controller_(controller) {
 }
 
 void TabContentsNotificationBridge::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  if (type == NotificationType::RENDER_VIEW_HOST_CHANGED) {
+  if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
     RenderViewHostSwitchedDetails* switched_details =
         Details<RenderViewHostSwitchedDetails>(details).ptr();
     [controller_ tabContentsRenderViewHostChanged:switched_details->old_host
                                           newHost:switched_details->new_host];
   } else {
     NOTREACHED();
   }
 }
 
 void TabContentsNotificationBridge::ChangeTabContents(TabContents* contents) {
   registrar_.RemoveAll();
   if (contents) {
     registrar_.Add(this,
-                   NotificationType::RENDER_VIEW_HOST_CHANGED,
+                   content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                    Source<NavigationController>(&contents->controller()));
   }
 }
 
 
 // A custom view that notifies |controller| that view's frame is changing.
 
 @interface ResizeNotificationView : NSView {
   TabContentsController* controller_;
 }
@@ skipping 123 matching lines @@
   // the view may have, so avoid changing the view hierarchy unless
   // the view is different.
   if ([self tabContents] != updatedContents) {
     [self changeTabContents:updatedContents];
     if ([self tabContents])
       [self ensureContentsVisible];
   }
 }
 
 @end