Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.

This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header.

BUG=98716
TBR=joi

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 16 deletions

diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
index 701f4e7..9aa37a8 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
@@ -32,9 +32,9 @@
 #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/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
@@ -317,7 +317,7 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   gtk_box_pack_end(GTK_BOX(hbox_), options_alignment, FALSE, FALSE, 0);
 
   notification_registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
-                              Source<ThemeService>(theme_service_));
+                              content::Source<ThemeService>(theme_service_));
 
   // We don't do InitThemesFor() because it just forces a redraw.
   gtk_util::ActAsRoundedWindow(frame_container_, ui::kGdkBlack, 3,
@@ -341,7 +341,7 @@ void BalloonViewImpl::Show(Balloon* balloon) {
 
   notification_registrar_.Add(this,
       chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-      Source<Balloon>(balloon));
+      content::Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::Update() {
@@ -385,14 +385,14 @@ gfx::Rect BalloonViewImpl::GetContentsRectangle() const {
 }
 
 void BalloonViewImpl::Observe(int type,
-                              const NotificationSource& source,
-                              const NotificationDetails& details) {
+                              const content::NotificationSource& source,
+                              const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_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,
         chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-        Source<Balloon>(balloon_));
+        content::Source<Balloon>(balloon_));
     Close(false);
   } else if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     // Since all the buttons change their own properties, and our expose does
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h
index 4a2afb8..45f7fd2 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h
@@ -14,8 +14,8 @@
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/gfx/point.h"
@@ -26,9 +26,7 @@ class BalloonCollection;
 class CustomDrawButton;
 class GtkThemeService;
 class MenuGtk;
-class NotificationDetails;
 class NotificationOptionsMenuModel;
-class NotificationSource;
 
 namespace ui {
 class SlideAnimation;
@@ -38,7 +36,7 @@ class SlideAnimation;
 // It draws a border, and within the border an HTML renderer.
 class BalloonViewImpl : public BalloonView,
                         public MenuGtk::Delegate,
-                        public NotificationObserver,
+                        public content::NotificationObserver,
                         public ui::AnimationDelegate {
  public:
   explicit BalloonViewImpl(BalloonCollection* collection);
@@ -56,10 +54,10 @@ class BalloonViewImpl : public BalloonView,
   virtual void StoppedShowing();
 
  private:
-  // NotificationObserver interface.
+  // content::NotificationObserver interface.
   virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details);
 
   // ui::AnimationDelegate interface.
   virtual void AnimationProgressed(const ui::Animation* animation);
@@ -131,7 +129,7 @@ class BalloonViewImpl : public BalloonView,
   // The button to open the options menu.
   scoped_ptr<CustomDrawButton> options_menu_button_;
 
-  NotificationRegistrar notification_registrar_;
+  content::NotificationRegistrar notification_registrar_;
 
   // Is the menu currently showing?
   bool menu_showing_;