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

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // 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_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 15 matching lines @@
 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 
 const int kMinimumWindowSize = 1;
 const double kBoundsChangeAnimationDuration = 0.25;
 
 // Delay before click on a titlebar is allowed to minimize the panel
 // after the 'draw attention' mode has been cleared.
@@ skipping 388 matching lines @@
 
   [boundsAnimation_ setAnimationBlockingMode: NSAnimationNonblocking];
   [boundsAnimation_ setDuration: kBoundsChangeAnimationDuration];
   [boundsAnimation_ startAnimation];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   if (windowShim_->panel()->expansion_state() == Panel::EXPANDED)
     [self enableTabContentsViewAutosizing];
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(windowShim_->panel()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 - (void)terminateBoundsAnimation {
   if (!boundsAnimation_)
     return;
   [boundsAnimation_ stopAnimation];
   [boundsAnimation_ setDelegate:nil];
   [boundsAnimation_ release];
   boundsAnimation_ = nil;
 }
@@ skipping 46 matching lines @@
     // being already expanded and drawing attention - in this case, we don't
     // want to minimize it on subsequent mouseUp.
     // We use time interval because the window may become key in various ways
     // (via keyboard for example) which are not distinguishable at this point.
     // Apparently this interval is not affecting the user in other cases.
     disableMinimizeUntilTime_ =
       base::Time::Now() + kSuspendMinimizeOnClickIntervalMs;
     [[self titlebarView] stopDrawingAttention];
   }
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
       content::Source<Panel>(windowShim_->panel()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 - (void)windowDidResignKey:(NSNotification*)notification {
   // If our app is still active and we're still the key window, ignore this
   // message, since it just means that a menu extra (on the "system status bar")
   // was activated; we'll get another |-windowDidResignKey| if we ever really
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == [self window]))
     return;
 
   // We need to deactivate the controls (in the "WebView"). To do this, get the
   // selected TabContents's RenderWidgetHostView and tell it to deactivate.
   if (TabContents* contents =
           windowShim_->browser()->GetSelectedTabContents()) {
     if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView())
       rwhv->SetActive(false);
   }
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
       content::Source<Panel>(windowShim_->panel()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 @end