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

chrome/browser/ui/gtk/custom_button.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/custom_button.h"
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 21 matching lines @@
   for (int i = 0; i < (GTK_STATE_INSENSITIVE + 1); ++i)
     surfaces_[i].reset(new CairoCachedSurface);
   background_image_.reset(new CairoCachedSurface);
 
   if (theme_provider) {
     // Load images by pretending that we got a BROWSER_THEME_CHANGED
     // notification.
     theme_provider->InitThemesFor(this);
 
     registrar_.Add(this,
-                   NotificationType::BROWSER_THEME_CHANGED,
+                   chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                    NotificationService::AllSources());
   } else {
     // Load the button images from the resource bundle.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     surfaces_[GTK_STATE_NORMAL]->UsePixbuf(
         normal_id_ ? rb.GetRTLEnabledPixbufNamed(normal_id_) : NULL);
     surfaces_[GTK_STATE_ACTIVE]->UsePixbuf(
         pressed_id_ ? rb.GetRTLEnabledPixbufNamed(pressed_id_) : NULL);
     surfaces_[GTK_STATE_PRELIGHT]->UsePixbuf(
         hover_id_ ? rb.GetRTLEnabledPixbufNamed(hover_id_) : NULL);
@@ skipping 80 matching lines @@
   } else {
     SkBitmap img =
         SkBitmapOperations::CreateButtonBackground(color, *image, *mask);
 
     GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&img);
     background_image_->UsePixbuf(pixbuf);
     g_object_unref(pixbuf);
   }
 }
 
-void CustomDrawButtonBase::Observe(NotificationType type,
+void CustomDrawButtonBase::Observe(int type,
     const NotificationSource& source, const NotificationDetails& details) {
   DCHECK(theme_service_);
-  DCHECK(NotificationType::BROWSER_THEME_CHANGED == type);
+  DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type);
 
   surfaces_[GTK_STATE_NORMAL]->UsePixbuf(normal_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(normal_id_) : NULL);
   surfaces_[GTK_STATE_ACTIVE]->UsePixbuf(pressed_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(pressed_id_) : NULL);
   surfaces_[GTK_STATE_PRELIGHT]->UsePixbuf(hover_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(hover_id_) : NULL);
   surfaces_[GTK_STATE_SELECTED]->UsePixbuf(NULL);
   surfaces_[GTK_STATE_INSENSITIVE]->UsePixbuf(disabled_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(disabled_id_) : NULL);
@@ skipping 80 matching lines @@
                                    GtkIconSize stock_size)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
                    disabled_id),
       theme_service_(theme_provider) {
   native_widget_.Own(gtk_image_new_from_stock(stock_id, stock_size));
 
   Init();
 
   theme_service_->InitThemesFor(this);
   registrar_.Add(this,
-                 NotificationType::BROWSER_THEME_CHANGED,
+                 chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 }
 
 CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
                                    GtkWidget* native_widget)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
                    disabled_id),
       native_widget_(native_widget),
       theme_service_(theme_provider) {
   Init();
 
   theme_service_->InitThemesFor(this);
   registrar_.Add(this,
-                 NotificationType::BROWSER_THEME_CHANGED,
+                 chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 }
 
 CustomDrawButton::~CustomDrawButton() {
   widget_.Destroy();
   native_widget_.Destroy();
 }
 
 void CustomDrawButton::Init() {
   widget_.Own(gtk_chrome_button_new());
   GTK_WIDGET_UNSET_FLAGS(widget(), GTK_CAN_FOCUS);
   g_signal_connect(widget(), "expose-event",
                    G_CALLBACK(OnCustomExposeThunk), this);
   hover_controller_.Init(widget());
 }
 
-void CustomDrawButton::Observe(NotificationType type,
+void CustomDrawButton::Observe(int type,
     const NotificationSource& source, const NotificationDetails& details) {
-  DCHECK(NotificationType::BROWSER_THEME_CHANGED == type);
+  DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type);
   SetBrowserTheme();
 }
 
 void CustomDrawButton::SetPaintOverride(GtkStateType state) {
   button_base_.set_paint_override(state);
   gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(widget()), state);
   gtk_widget_queue_draw(widget());
 }
 
 void CustomDrawButton::UnsetPaintOverride() {
@@ skipping 41 matching lines @@
     gtk_widget_set_app_paintable(widget(), TRUE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), UseGtkTheme());
 }
 
 bool CustomDrawButton::UseGtkTheme() {
   return theme_service_ && theme_service_->UsingNativeTheme();
 }