Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / ash_keyboard_controller_proxy.h

diff --git a/src/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h b/src/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
index bd33a37..791d2b8 100644 (file)
--- a/src/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
+++ b/src/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
@@ -11,12 +11,11 @@
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "ui/keyboard/keyboard_controller_proxy.h"
 
-class ExtensionFunctionDispatcher;
-
 namespace content {
 class WebContents;
 }
 namespace extensions {
+class ExtensionFunctionDispatcher;
 class WindowController;
 }
 namespace gfx {
@@ -31,14 +30,12 @@ class InputMethod;
 class AshKeyboardControllerProxy
     : public keyboard::KeyboardControllerProxy,
       public content::WebContentsObserver,
-      public ExtensionFunctionDispatcher::Delegate {
+      public extensions::ExtensionFunctionDispatcher::Delegate {
  public:
   AshKeyboardControllerProxy();
   virtual ~AshKeyboardControllerProxy();
 
  private:
-  friend class AshKeyboardControllerProxyTest;
-
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
 
   // keyboard::KeyboardControllerProxy overrides
@@ -49,7 +46,6 @@ class AshKeyboardControllerProxy
       const content::MediaResponseCallback& callback) OVERRIDE;
   virtual void SetupWebContents(content::WebContents* contents) OVERRIDE;
   virtual void ShowKeyboardContainer(aura::Window* container) OVERRIDE;
-  virtual void EnsureCaretInWorkArea() OVERRIDE;
 
   // The overridden implementation dispatches
   // chrome.virtualKeyboardPrivate.onTextInputBoxFocused event to extension to
@@ -60,7 +56,7 @@ class AshKeyboardControllerProxy
   // that case.
   virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE;
 
-  // ExtensionFunctionDispatcher::Delegate overrides
+  // extensions::ExtensionFunctionDispatcher::Delegate overrides
   virtual extensions::WindowController* GetExtensionWindowController() const
       OVERRIDE;
   virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
@@ -68,7 +64,8 @@ class AshKeyboardControllerProxy
   // content::WebContentsObserver overrides
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
+  scoped_ptr<extensions::ExtensionFunctionDispatcher>
+      extension_function_dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy);
 };