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: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 47873003: Add a full screen virtual keyboard to virtual keyboard root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index d021e0cc35afed672f6f25ff6744f9d428855163..46b5795003dc85defb97d1dab11ca168637d17fd 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -95,9 +95,12 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
// Initialize TabScrubber after the Ash Shell has been initialized.
TabScrubber::GetInstance();
// Activate virtual keyboard after profile is initialized. It depends on the
- // default profile.
- ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
- ash::Shell::GetInstance()->keyboard_controller());
+ // default profile. If keyboard usability test flag is set, defer the
+ // activation to UpdateWindow() in virtual_keyboard_window_controller.cc.
+ if (!keyboard::IsKeyboardUsabilityTestEnabled()) {
+ ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
+ ash::Shell::GetInstance()->keyboard_controller());
+ }
}
void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {

Powered by Google App Engine
This is Rietveld 408576698