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

chrome/browser/ui/gtk/bubble/bubble_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/ui/gtk/bubble/bubble_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "ui/base/gtk/gtk_windowing.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // The height of the arrow, and the width will be about twice the height.
 const int kArrowSize = 8;
@@ skipping 149 matching lines @@
   signals_.Connect(toplevel_window_, "destroy",
                    G_CALLBACK(gtk_widget_destroyed), &toplevel_window_);
 
   gtk_widget_show_all(window_);
 
   if (grab_input_) {
     gtk_grab_add(window_);
     GrabPointerAndKeyboard();
   }
 
-  registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(theme_service_));
   theme_service_->InitThemesFor(this);
 }
 
 // NOTE: This seems a bit overcomplicated, but it requires a bunch of careful
 // fudging to get the pixels rasterized exactly where we want them, the arrow to
 // have a 1 pixel point, etc.
 // TODO(deanm): Windows draws with Skia and uses some PNG images for the
 // corners.  This is a lot more work, but they get anti-aliasing.
 // static
@@ skipping 143 matching lines @@
 
   gtk_window_move(GTK_WINDOW(window_), screen_x, screen_y);
 }
 
 void BubbleGtk::StackWindow() {
   // Stack our window directly above the toplevel window.
   if (toplevel_window_)
     ui::StackPopupWindow(window_, GTK_WIDGET(toplevel_window_));
 }
 
-void BubbleGtk::Observe(NotificationType type,
+void BubbleGtk::Observe(int type,
                         const NotificationSource& source,
                         const NotificationDetails& details) {
-  DCHECK_EQ(type.value, NotificationType::BROWSER_THEME_CHANGED);
+  DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
   if (theme_service_->UsingNativeTheme() && match_system_theme_) {
     gtk_widget_modify_bg(window_, GTK_STATE_NORMAL, NULL);
   } else {
     // Set the background color, so we don't need to paint it manually.
     gtk_widget_modify_bg(window_, GTK_STATE_NORMAL, &kBackgroundColor);
   }
 }
 
 void BubbleGtk::HandlePointerAndKeyboardUngrabbedByContent() {
   if (grab_input_)
@@ skipping 167 matching lines @@
 gboolean BubbleGtk::OnToplevelUnmap(GtkWidget* widget, GdkEvent* event) {
   Close();
   return FALSE;
 }
 
 void BubbleGtk::OnAnchorAllocate(GtkWidget* widget,
                                  GtkAllocation* allocation) {
   if (!UpdateArrowLocation(false))
     MoveWindow();
 }