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

Unified Diff: ash/root_window_controller.cc

Issue 25111002: Only show virtual keyboard on primary root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add unit tests Created 7 years, 3 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 | « no previous file | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 3b36a710965dc96bd43d78c610f0cb55e440cc7e..78056621e0bc65ef47a14d5f592e9930e6b88234 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -520,9 +520,10 @@ const aura::Window* RootWindowController::GetTopmostFullscreenWindow() const {
}
void RootWindowController::InitKeyboard() {
- if (keyboard::IsKeyboardEnabled()) {
- aura::Window* parent = root_window();
-
+ aura::Window* parent = root_window();
+ // Restricts virtual keyboard to primary root window.
+ if (keyboard::IsKeyboardEnabled() &&
+ Shell::GetPrimaryRootWindow() == parent) {
keyboard::KeyboardControllerProxy* proxy =
Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
keyboard_controller_.reset(
oshima 2013/09/28 04:37:27 If there should be only one KeyboardCOntroller, sh
bshe 2013/09/30 18:20:50 +sadrul I am happy to do the suggested change. Bu
sadrul 2013/09/30 18:31:50 Yeah, if we decide to show the keyboard just on th
« no previous file with comments | « no previous file | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698