Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2056)

Unified Diff: ash/shell/keyboard_controller_proxy_stub.cc

Issue 276483002: Fix calculation of usable area of screen when VK is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell/keyboard_controller_proxy_stub.h ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/keyboard_controller_proxy_stub.cc
diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc
index 04d1bf307996ed43d7097b57a56bcc4cdab84db7..2376c1d355eea933ed7c082ac5944bb68f17ef45 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(
« no previous file with comments | « ash/shell/keyboard_controller_proxy_stub.h ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698