| Index: ash/shell/shell_delegate_impl.cc
|
| diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
|
| index 318873c608a1017fcdf88c3d8e33e8d12f33a346..0bd0a6c225b70a8e430b7ffc9e9e7d3bc568ae93 100644
|
| --- a/ash/shell/shell_delegate_impl.cc
|
| +++ b/ash/shell/shell_delegate_impl.cc
|
| @@ -12,45 +12,16 @@
|
| #include "ash/session_state_delegate_stub.h"
|
| #include "ash/shell/context_menu.h"
|
| #include "ash/shell/example_factory.h"
|
| +#include "ash/shell/keyboard_controller_proxy_stub.h"
|
| #include "ash/shell/launcher_delegate_impl.h"
|
| #include "ash/shell/toplevel_window.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "ui/aura/window.h"
|
| -#include "ui/keyboard/keyboard_controller_proxy.h"
|
| #include "ui/views/corewm/input_method_event_filter.h"
|
|
|
| namespace ash {
|
| -
|
| -namespace {
|
| -
|
| -class DummyKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
|
| - public:
|
| - DummyKeyboardControllerProxy() {}
|
| - virtual ~DummyKeyboardControllerProxy() {}
|
| -
|
| - private:
|
| - // Overridden from keyboard::KeyboardControllerProxy:
|
| - virtual content::BrowserContext* GetBrowserContext() OVERRIDE {
|
| - return Shell::GetInstance()->browser_context();
|
| - }
|
| -
|
| - virtual ui::InputMethod* GetInputMethod() OVERRIDE {
|
| - return Shell::GetInstance()->input_method_filter()->input_method();
|
| - }
|
| -
|
| - virtual void RequestAudioInput(content::WebContents* web_contents,
|
| - const content::MediaStreamRequest& request,
|
| - const content::MediaResponseCallback& callback) OVERRIDE {
|
| - return;
|
| - }
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(DummyKeyboardControllerProxy);
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| namespace shell {
|
|
|
| ShellDelegateImpl::ShellDelegateImpl()
|
| @@ -128,7 +99,7 @@ void ShellDelegateImpl::ShowKeyboardOverlay() {
|
|
|
| keyboard::KeyboardControllerProxy*
|
| ShellDelegateImpl::CreateKeyboardControllerProxy() {
|
| - return new DummyKeyboardControllerProxy();
|
| + return new KeyboardControllerProxyStub();
|
| }
|
|
|
| void ShellDelegateImpl::ShowTaskManager() {
|
|
|