| 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 f530490d1c77f5a7f9cc94ec73579cc4b2c3a123..85ba9a28206eb8d35edbe9d6980189e3ebc80ac3 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
|
| @@ -19,7 +19,6 @@
|
| #include "ui/gfx/screen_type_delegate.h"
|
| #include "ui/keyboard/keyboard.h"
|
| #include "ui/keyboard/keyboard_controller.h"
|
| -#include "ui/keyboard/keyboard_util.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/ui/views/select_file_dialog_extension.h"
|
| @@ -107,12 +106,9 @@ 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. If keyboard usability experiment flag is set, defer the
|
| - // activation to UpdateWindow() in virtual_keyboard_window_controller.cc.
|
| - if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) {
|
| - ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
|
| - keyboard::KeyboardController::GetInstance());
|
| - }
|
| + // default profile.
|
| + ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
|
| + keyboard::KeyboardController::GetInstance());
|
| }
|
|
|
| void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
|
|
|