diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 14:44:23 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 14:44:23 +0000 |
| commit | 2082d7d6d6bfea09172e21089abca21c73d317f3 (patch) | |
| tree | 3f78a39f902f359afe1dace444cf7e643556884d /ash/shell/keyboard_controller_proxy_stub.cc | |
| parent | 8f3215e30b1223866710145d05fe29ba5863a34b (diff) | |
| download | chromium_src-2082d7d6d6bfea09172e21089abca21c73d317f3.zip chromium_src-2082d7d6d6bfea09172e21089abca21c73d317f3.tar.gz chromium_src-2082d7d6d6bfea09172e21089abca21c73d317f3.tar.bz2 | |
Fix calculation of usable area of screen when VK is shown.
First part of a 2-sided patch to fix scroll-into-view with VK overscroll.
BUG=370592
Review URL: https://codereview.chromium.org/276483002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/keyboard_controller_proxy_stub.cc')
| -rw-r--r-- | ash/shell/keyboard_controller_proxy_stub.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc index 04d1bf3..2376c1d 100644 --- a/ash/shell/keyboard_controller_proxy_stub.cc +++ b/ash/shell/keyboard_controller_proxy_stub.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ui/aura/window.h" -#include "ui/wm/core/input_method_event_filter.h" +#include "ui/base/ime/mock_input_method.h" using namespace content; @@ -37,7 +37,9 @@ BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { } ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { - return Shell::GetInstance()->input_method_filter()->input_method(); + if (!input_method_) + input_method_.reset(new ui::MockInputMethod(NULL)); + return input_method_.get(); } void KeyboardControllerProxyStub::RequestAudioInput( |