Update To 11.40.268.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 1cba369..e5b8dd0 100644 (file)
--- a/src/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
+++ b/src/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
@@ -7,16 +7,15 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "content/public/browser/web_contents_observer.h"
+#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 {
@@ -26,25 +25,28 @@ namespace ui {
 class InputMethod;
 }
 
+// Subclass of KeyboardControllerProxy. It is used by KeyboardController to get
+// access to the virtual keyboard window and setup Chrome extension functions.
 class AshKeyboardControllerProxy
     : public keyboard::KeyboardControllerProxy,
       public content::WebContentsObserver,
-      public ExtensionFunctionDispatcher::Delegate {
+      public extensions::ExtensionFunctionDispatcher::Delegate {
  public:
   AshKeyboardControllerProxy();
-  virtual ~AshKeyboardControllerProxy();
+  ~AshKeyboardControllerProxy() override;
 
  private:
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
 
   // keyboard::KeyboardControllerProxy overrides
-  virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
-  virtual ui::InputMethod* GetInputMethod() OVERRIDE;
-  virtual void RequestAudioInput(content::WebContents* web_contents,
+  content::BrowserContext* GetBrowserContext() override;
+  ui::InputMethod* GetInputMethod() override;
+  void RequestAudioInput(
+      content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
-  virtual void SetupWebContents(content::WebContents* contents) OVERRIDE;
-  virtual void ShowKeyboardContainer(aura::Window* container) OVERRIDE;
+      const content::MediaResponseCallback& callback) override;
+  void SetupWebContents(content::WebContents* contents) override;
+  void ShowKeyboardContainer(aura::Window* container) override;
 
   // The overridden implementation dispatches
   // chrome.virtualKeyboardPrivate.onTextInputBoxFocused event to extension to
@@ -53,17 +55,17 @@ class AshKeyboardControllerProxy
   // information, but not when the virtual keyboard is used in conjunction with
   // another IME. virtualKeyboardPrivate.onTextInputBoxFocused is the remedy in
   // that case.
-  virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE;
+  void SetUpdateInputType(ui::TextInputType type) override;
 
-  // ExtensionFunctionDispatcher::Delegate overrides
-  virtual extensions::WindowController* GetExtensionWindowController() const
-      OVERRIDE;
-  virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
+  // extensions::ExtensionFunctionDispatcher::Delegate overrides
+  extensions::WindowController* GetExtensionWindowController() const override;
+  content::WebContents* GetAssociatedWebContents() const override;
 
   // content::WebContentsObserver overrides
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  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);
 };