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

chrome/browser/tab_contents/tab_contents_view_gtk.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/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/gtk/gtk_floating_container.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/sad_tab_gtk.h"
 #include "chrome/browser/ui/gtk/tab_contents_drag_source.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webdropdata.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
 namespace {
 
@@ skipping 48 matching lines @@
   g_signal_connect(expanded_, "size-allocate",
                    G_CALLBACK(OnSizeAllocateThunk), this);
   g_signal_connect(expanded_, "child-size-request",
                    G_CALLBACK(OnChildSizeRequestThunk), this);
   g_signal_connect(floating_.get(), "set-floating-position",
                    G_CALLBACK(OnSetFloatingPositionThunk), this);
 
   gtk_container_add(GTK_CONTAINER(floating_.get()), expanded_);
   gtk_widget_show(expanded_);
   gtk_widget_show(floating_.get());
-  registrar_.Add(this, NotificationType::TAB_CONTENTS_CONNECTED,
+  registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
                  Source<TabContents>(tab_contents));
   drag_source_.reset(new TabContentsDragSource(this));
 }
 
 TabContentsViewGtk::~TabContentsViewGtk() {
   floating_.Destroy();
 }
 
 void TabContentsViewGtk::AttachConstrainedWindow(
     ConstrainedWindowGtk* constrained_window) {
@@ skipping 162 matching lines @@
 
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void TabContentsViewGtk::TakeFocus(bool reverse) {
   if (!tab_contents()->delegate()->TakeFocus(reverse)) {
     gtk_widget_child_focus(GTK_WIDGET(GetTopLevelNativeWindow()),
         reverse ? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD);
   }
 }
 
-void TabContentsViewGtk::Observe(NotificationType type,
+void TabContentsViewGtk::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::TAB_CONTENTS_CONNECTED: {
+  switch (type) {
+    case content::NOTIFICATION_TAB_CONTENTS_CONNECTED: {
       // No need to remove the SadTabGtk's widget from the container since
       // the new RenderWidgetHostViewGtk instance already removed all the
       // vbox's children.
       sad_tab_.reset();
       break;
     }
     default:
       NOTREACHED() << "Got a notification we didn't register for.";
       break;
   }
@@ skipping 147 matching lines @@
   g_value_set_int(&value, child_x);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget, "x", &value);
 
   int child_y = std::max((allocation->height - requisition.height) / 2, 0);
   g_value_set_int(&value, child_y);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget, "y", &value);
   g_value_unset(&value);
 }