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

chrome/browser/chromeos/frame/panel_controller.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/chromeos/frame/panel_controller.h"
 
 #if defined(TOUCH_UI)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/image_button.h"
@@ skipping 357 matching lines @@
 
 bool PanelController::PanelClientEvent(GdkEventClient* event) {
 #if defined(TOOLKIT_USES_GTK)
   WmIpc::Message msg;
   WmIpc::instance()->DecodeMessage(*event, &msg);
   if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_PANEL_STATE) {
     bool new_state = msg.param(0);
     if (expanded_ != new_state) {
       expanded_ = new_state;
       State state = new_state ? EXPANDED : MINIMIZED;
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_PANEL_STATE_CHANGED,
           content::Source<PanelController>(this),
           content::Details<State>(&state));
     }
   }
 #endif
   return true;
 }
 
 void PanelController::Close() {
@@ skipping 114 matching lines @@
     views::Button* sender, const views::Event& event) {
   if (panel_controller_ && sender == close_button_)
     panel_controller_->OnCloseButtonPressed();
 }
 
 PanelController::TitleContentView::~TitleContentView() {
   VLOG(1) << "panel: delete " << this;
 }
 
 }  // namespace chromeos