Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/ui/panels/panel_browser_window_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/panels/panel_browser_window_gtk.h"
 
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 
 namespace {
 
 // This value is experimental and subjective.
 const int kSetBoundsAnimationMs = 180;
 
 // RGB values for titlebar in draw attention state. A shade of orange.
 const int kDrawAttentionR = 0xfa;
@@ skipping 118 matching lines @@
 
   window_size_known_ = true;
   int bottom = panel_->manager()->GetBottomPositionForExpansionState(
       panel_->expansion_state());
   int top = bottom - height;
 
   gtk_window_move(window_, bounds_.x(), top);
   StartBoundsAnimation(gfx::Rect(bounds_.x(), top, width, height));
   panel_->OnWindowSizeAvailable();
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_WINDOW_SIZE_KNOWN,
       content::Source<Panel>(panel_.get()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 bool PanelBrowserWindowGtk::UseCustomFrame() {
   // We always use custom frame for panels.
   return TRUE;
 }
 
 void PanelBrowserWindowGtk::ShowSettingsMenu(GtkWidget* widget,
                                              GdkEventButton* event) {
   if (!settings_menu_.get()) {
@@ skipping 24 matching lines @@
     gdk_region_destroy(dest_region);
   }
 }
 
 void PanelBrowserWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
   bool was_active = IsActive();
   BrowserWindowGtk::ActiveWindowChanged(active_window);
   if (was_active == IsActive())  // State didn't change.
     return;
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
       content::Source<Panel>(panel_.get()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 BrowserWindowGtk::TitleDecoration PanelBrowserWindowGtk::GetWindowTitle(
     std::string* title) const {
   if (is_drawing_attention_) {
     std::string title_original;
     BrowserWindowGtk::TitleDecoration title_decoration =
         BrowserWindowGtk::GetWindowTitle(&title_original);
     DCHECK_EQ(BrowserWindowGtk::PLAIN_TEXT, title_decoration);
     gchar* title_escaped = g_markup_escape_text(title_original.c_str(), -1);
@@ skipping 208 matching lines @@
     GtkTargetList* list = ui::GetTargetListFromCodeMask(ui::CHROME_TAB);
     gtk_drag_begin(drag_widget_, list, GDK_ACTION_MOVE, 1, last_mouse_down_);
     // gtk_drag_begin increments reference count for GtkTargetList.  So unref
     // it here to reduce the reference count.
     gtk_target_list_unref(list);
     panel_->manager()->StartDragging(panel_.get());
   }
 }
 
 void PanelBrowserWindowGtk::AnimationEnded(const ui::Animation* animation) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel_.get()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 void PanelBrowserWindowGtk::AnimationProgressed(
     const ui::Animation* animation) {
   DCHECK(!drag_widget_);
   DCHECK(window_size_known_);
 
   gfx::Rect new_bounds = bounds_animator_->CurrentValueBetween(
       animation_start_bounds_, bounds_);
 
@@ skipping 273 matching lines @@
   }
 }
 
 bool NativePanelTestingGtk::IsWindowSizeKnown() const {
   return panel_browser_window_gtk_->window_size_known_;
 }
 
 bool NativePanelTestingGtk::IsAnimatingBounds() const {
   return panel_browser_window_gtk_->IsAnimatingBounds();
 }