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

chrome/browser/extensions/extension_input_api.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/extensions/extension_input_api.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/key_identifier_conversion_views.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "views/events/event.h"
 #include "views/ime/input_method.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
 
 #if defined(USE_VIRTUAL_KEYBOARD)
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #endif
 
 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #endif
 
 namespace {
 
@@ skipping 125 matching lines @@
   } else if (!widget->OnKeyEvent(event)) {
     error_ = kKeyEventUnprocessedError;
     return false;
   }
 
   return true;
 }
 
 #if defined(USE_VIRTUAL_KEYBOARD)
 bool HideKeyboardFunction::RunImpl() {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_HIDE_KEYBOARD_INVOKED,
       content::Source<HideKeyboardFunction>(this),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
   return true;
 }
 
 bool SetKeyboardHeightFunction::RunImpl() {
   int height = 0;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &height));
 
   if (height < 0) {
     error_ = kInvalidHeight;
     return false;
   }
 
   // TODO(penghuang) Check the height is not greater than height of browser view
   // and set the height of virtual keyboard directly instead of using
   // notification.
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED,
       content::Source<SetKeyboardHeightFunction>(this),
       content::Details<int>(&height));
   return true;
 }
 #endif
 
 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
 // TODO(yusukes): This part should be moved to extension_input_api_chromeos.cc.
 bool SendHandwritingStrokeFunction::RunImpl() {
@@ skipping 36 matching lines @@
   int stroke_count = 0;  // zero means 'clear all strokes'.
   if (HasOptionalArgument(0)) {
     EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &stroke_count));
     EXTENSION_FUNCTION_VALIDATE(stroke_count >= 0);
   }
   chromeos::input_method::InputMethodManager::GetInstance()->
       CancelHandwritingStrokes(stroke_count);
   return true;
 }
 #endif