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

chrome/browser/ui/gtk/notifications/balloon_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/ui/gtk/notifications/balloon_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_options_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ skipping 259 matching lines @@
                    G_CALLBACK(OnOptionsMenuButtonThunk), this);
   GTK_WIDGET_UNSET_FLAGS(options_menu_button_->widget(), GTK_CAN_FOCUS);
   GtkWidget* options_alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(options_alignment),
                             kShelfVerticalMargin, kShelfVerticalMargin,
                             0, kButtonSpacing);
   gtk_container_add(GTK_CONTAINER(options_alignment),
                     options_menu_button_->widget());
   gtk_box_pack_end(GTK_BOX(hbox_), options_alignment, FALSE, FALSE, 0);
 
-  notification_registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+  notification_registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                               Source<ThemeService>(theme_service_));
 
   // We don't do InitThemesFor() because it just forces a redraw.
   gtk_util::ActAsRoundedWindow(frame_container_, gtk_util::kGdkBlack, 3,
                                gtk_util::ROUNDED_ALL,
                                gtk_util::BORDER_ALL);
 
   // Realize the frame container so we can do size calculations.
   gtk_widget_realize(frame_container_);
 
   // Update to make sure we have everything sized properly and then move our
   // window offscreen for its initial animation.
   html_contents_->UpdateActualSize(balloon_->content_size());
   int window_width;
   gtk_window_get_size(GTK_WINDOW(frame_container_), &window_width, NULL);
 
   int pos_x = gdk_screen_width() - window_width - kScreenBorder;
   int pos_y = gdk_screen_height();
   gtk_window_move(GTK_WINDOW(frame_container_), pos_x, pos_y);
   balloon_->SetPosition(gfx::Point(pos_x, pos_y), false);
   gtk_widget_show_all(frame_container_);
 
   notification_registrar_.Add(this,
-      NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
+      chrome::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::Update() {
   DCHECK(html_contents_.get()) << "BalloonView::Update called before Show";
   if (html_contents_->render_view_host())
     html_contents_->render_view_host()->NavigateToURL(
         balloon_->notification().content_url());
 }
 
 gfx::Point BalloonViewImpl::GetContentsOffset() const {
@@ skipping 22 matching lines @@
     return gfx::Rect();
 
   gfx::Size content_size = balloon_->content_size();
   gfx::Point offset = GetContentsOffset();
   int x = 0, y = 0;
   gtk_window_get_position(GTK_WINDOW(frame_container_), &x, &y);
   return gfx::Rect(x + offset.x(), y + offset.y(),
                    content_size.width(), content_size.height());
 }
 
-void BalloonViewImpl::Observe(NotificationType type,
+void BalloonViewImpl::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  if (type == NotificationType::NOTIFY_BALLOON_DISCONNECTED) {
+  if (type == chrome::NOTIFY_BALLOON_DISCONNECTED) {
     // If the renderer process attached to this balloon is disconnected
     // (e.g., because of a crash), we want to close the balloon.
     notification_registrar_.Remove(this,
-        NotificationType::NOTIFY_BALLOON_DISCONNECTED,
+        chrome::NOTIFY_BALLOON_DISCONNECTED,
         Source<Balloon>(balloon_));
     Close(false);
-  } else if (type == NotificationType::BROWSER_THEME_CHANGED) {
+  } else if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     // Since all the buttons change their own properties, and our expose does
     // all the real differences, we'll need a redraw.
     gtk_widget_queue_draw(frame_container_);
   } else {
     NOTREACHED();
   }
 }
 
 void BalloonViewImpl::OnCloseButton(GtkWidget* widget) {
   Close(true);
@@ skipping 67 matching lines @@
         method_factory_.NewRunnableMethod(
             &BalloonViewImpl::DelayedClose, false));
   }
 }
 
 gboolean BalloonViewImpl::OnDestroy(GtkWidget* widget) {
   frame_container_ = NULL;
   Close(false);
   return FALSE;  // Propagate.
 }