Chromium Code Reviews| 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()) { |
|
James Cook
2013/11/14 17:15:51
This sounds like "keyboard usability test" is runn
bshe
2013/11/14 17:35:42
renamed to KeyboardUsabilityExperiment and added c
|
| + ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
| + ash::Shell::GetInstance()->keyboard_controller()); |
| + } |
| } |
| void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |