Index: chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc |
diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc |
index 0b792444a3fa4d5dc38c59a37624375362c87387..bdb53572686ef8e375ed6f9ce7796fca19897f99 100644 |
--- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc |
+++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc |
@@ -14,7 +14,6 @@ |
#include "content/public/browser/site_instance.h" |
#include "content/public/browser/web_contents.h" |
#include "extensions/browser/event_router.h" |
-#include "extensions/browser/extension_function_dispatcher.h" |
#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/view_type_utils.h" |
#include "extensions/common/api/virtual_keyboard_private.h" |
@@ -118,12 +117,6 @@ AshKeyboardControllerProxy::~AshKeyboardControllerProxy() { |
DCHECK(!keyboard_controller_); |
} |
-void AshKeyboardControllerProxy::OnRequest( |
- const ExtensionHostMsg_Request_Params& params) { |
- extension_function_dispatcher_->Dispatch( |
- params, web_contents()->GetRenderViewHost()); |
-} |
- |
ui::InputMethod* AshKeyboardControllerProxy::GetInputMethod() { |
aura::Window* root_window = ash::Shell::GetInstance()->GetPrimaryRootWindow(); |
DCHECK(root_window); |
@@ -149,20 +142,12 @@ void AshKeyboardControllerProxy::RequestAudioInput( |
void AshKeyboardControllerProxy::SetupWebContents( |
content::WebContents* contents) { |
- extension_function_dispatcher_.reset( |
- new extensions::ExtensionFunctionDispatcher(browser_context(), this)); |
extensions::SetViewType(contents, extensions::VIEW_TYPE_VIRTUAL_KEYBOARD); |
extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( |
contents); |
Observe(contents); |
} |
-extensions::WindowController* |
- AshKeyboardControllerProxy::GetExtensionWindowController() const { |
- // The keyboard doesn't have a window controller. |
- return NULL; |
-} |
- |
void AshKeyboardControllerProxy::SetController( |
keyboard::KeyboardController* controller) { |
// During KeyboardController destruction, controller can be set to null. |
@@ -177,21 +162,6 @@ void AshKeyboardControllerProxy::SetController( |
keyboard_controller_->AddObserver(observer_.get()); |
} |
-content::WebContents* |
- AshKeyboardControllerProxy::GetAssociatedWebContents() const { |
- return web_contents(); |
-} |
- |
-bool AshKeyboardControllerProxy::OnMessageReceived( |
- const IPC::Message& message) { |
- bool handled = true; |
- IPC_BEGIN_MESSAGE_MAP(AshKeyboardControllerProxy, message) |
- IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) |
- IPC_MESSAGE_UNHANDLED(handled = false) |
- IPC_END_MESSAGE_MAP() |
- return handled; |
-} |
- |
void AshKeyboardControllerProxy::RenderViewCreated( |
content::RenderViewHost* render_view_host) { |
content::HostZoomMap* zoom_map = |