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

chrome/browser/ui/panels/panel_browser_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/panels/panel_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/webui/task_manager_dialog.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/label.h"
 #include "views/widget/widget.h"
 
 namespace {
 // This value is experimental and subjective.
 const int kSetBoundsAnimationMs = 180;
 
@@ skipping 142 matching lines @@
   if (focused_) {
     // Expand the panel if needed.
     if (panel_->expansion_state() == Panel::MINIMIZED)
       panel_->SetExpansionState(Panel::EXPANDED);
 
     // Clear the attention state if needed.
     if (is_drawing_attention_)
       StopDrawingAttention();
   }
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
       content::Source<Panel>(panel()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 bool PanelBrowserView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
   if (mouse_pressed_ && accelerator.key_code() == ui::VKEY_ESCAPE) {
     OnTitlebarMouseCaptureLost();
     return true;
   }
 
   // No other accelerator is allowed when the drag begins.
   if (mouse_dragging_state_ == DRAGGING_STARTED)
     return true;
 
   return BrowserView::AcceleratorPressed(accelerator);
 }
 
 void PanelBrowserView::AnimationEnded(const ui::Animation* animation) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 void PanelBrowserView::AnimationProgressed(const ui::Animation* animation) {
   gfx::Rect new_bounds = bounds_animator_->CurrentValueBetween(
       animation_start_bounds_, bounds_);
   ::BrowserView::SetBounds(new_bounds);
 }
 
 void PanelBrowserView::OnDisplayChanged() {
   BrowserView::OnDisplayChanged();
@@ skipping 332 matching lines @@
 }
 
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_browser_view_->bounds_animator_.get() &&
          panel_browser_view_->bounds_animator_->is_animating();
 }