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

Unified Diff: ash/shell.cc

Issue 34783006: Add --keyboard-usability-test flag and always show keyboard unless manually hide (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 7 years, 2 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/root_window_controller_unittest.cc ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b87a9467f5272313bea319e337026640b6d364ae..3f404cf7598c5f8904c22a154da08b1e67496366 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -337,6 +337,8 @@ void Shell::OnLoginStateChanged(user::LoginStatus status) {
// TODO(bshe): Primary root window controller may not be the controller to
// attach virtual keyboard. See http://crbug.com/303429
InitKeyboard(GetPrimaryRootWindowController());
+ GetPrimaryRootWindowController()->ActivateKeyboard(
+ keyboard_controller_.get());
}
FOR_EACH_OBSERVER(ShellObserver, observers_, OnLoginStateChanged(status));
}
@@ -910,7 +912,6 @@ void Shell::InitKeyboard(internal::RootWindowController* root) {
delegate_->CreateKeyboardControllerProxy();
keyboard_controller_.reset(
new keyboard::KeyboardController(proxy));
- root->ActivateKeyboard(keyboard_controller_.get());
}
}
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698