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

chrome/browser/ui/views/notifications/balloon_view.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/views/notifications/balloon_view.h"
 
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.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/ui/views/bubble/bubble_border.h"
 #include "chrome/browser/ui/views/notifications/balloon_view_host.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_details.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_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/controls/button/button.h"
@@ skipping 317 matching lines @@
 
   source_label_->SetFont(rb.GetFont(ResourceBundle::SmallFont));
   source_label_->SetColor(kControlBarTextColor);
   source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   source_label_->SetBoundsRect(GetLabelBounds());
 
   SizeContentsWindow();
   html_container_->Show();
   frame_container_->Show();
 
-  notification_registrar_.Add(this,
-    NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
+  notification_registrar_.Add(
+    this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
+    Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::RunOptionsMenu(const gfx::Point& pt) {
   CreateOptionsMenu();
   options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 void BalloonViewImpl::CreateOptionsMenu() {
   if (options_menu_model_.get())
     return;
@@ skipping 109 matching lines @@
       kLeftMargin, 1 + GetShelfHeight(), line_width, 1);
 
   View::OnPaint(canvas);
   OnPaintBorder(canvas);
 }
 
 void BalloonViewImpl::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   SizeContentsWindow();
 }
 
-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::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED) {
     NOTREACHED();
     return;
   }
 
   // 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, Source<Balloon>(balloon_));
+  notification_registrar_.Remove(
+      this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
+      Source<Balloon>(balloon_));
   Close(false);
 }