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

chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.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/virtual_keyboard/virtual_keyboard_manager.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/screen.h"
 #include "views/ime/text_input_type_tracker.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 168 matching lines @@
   TabContentsObserver::Observe(dom_view_->dom_contents()->tab_contents());
 
   // Initialize the animation.
   animation_.reset(new ui::SlideAnimation(this));
   animation_->SetTweenType(ui::Tween::LINEAR);
   animation_->SetSlideDuration(kKeyboardSlideDuration);
 
   views::TextInputTypeTracker::GetInstance()->AddTextInputTypeObserver(this);
   registrar_.Add(this,
                  chrome::NOTIFICATION_FOCUSED_EDITABLE_NODE_TOUCHED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_HIDE_KEYBOARD_INVOKED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_APP_TERMINATING,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::GetInstance();
   manager->AddVirtualKeyboardObserver(this);
 #endif
 
 #if defined(USE_AURA)
   aura::Desktop::GetInstance()->AddObserver(this);
 #endif
@@ skipping 22 matching lines @@
 
   transform_.reset(new ui::InterpolatedTranslation(
       gfx::Point(0, keyboard_height_), gfx::Point()));
 
   UpdateForAnimation();
   animation_->Show();
 
   Show();
 
   bool visible = true;
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_KEYBOARD_VISIBILITY_CHANGED,
       content::Source<KeyboardWidget>(this),
       content::Details<bool>(&visible));
 }
 
 void KeyboardWidget::ResetBounds() {
   SetBounds(GetKeyboardPosition(keyboard_height_));
 }
 
 void KeyboardWidget::Hide() {
   animation_->Hide();
 
   bool visible = false;
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_KEYBOARD_VISIBILITY_CHANGED,
       content::Source<KeyboardWidget>(this),
       content::Details<bool>(&visible));
 }
 
 void KeyboardWidget::SetTarget(views::Widget* target) {
   if (target_)
     target_->RemoveObserver(this);
 
   target_ = target;
@@ skipping 31 matching lines @@
   UpdateForAnimation();
 }
 
 void KeyboardWidget::AnimationEnded(const ui::Animation* animation) {
   gfx::Rect keyboard_rect;
   if (animation_->GetCurrentValue() < 0.01)
     Widget::Hide();
   else
     keyboard_rect = GetWindowScreenBounds();
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_KEYBOARD_VISIBLE_BOUNDS_CHANGED,
       content::Source<KeyboardWidget>(this),
       content::Details<gfx::Rect>(&keyboard_rect));
 }
 
 bool KeyboardWidget::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(KeyboardWidget, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ skipping 212 matching lines @@
 
 void VirtualKeyboardManager::OnDesktopBoundsChanged(
     const gfx::Rect& prev_bounds) {
   keyboard_->ResetBounds();
 }
 
 // static
 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
   return Singleton<VirtualKeyboardManager>::get();
 }