| 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 a4ad3490aa44bb4a8e642bb12d8a2df788cad584..d021e0cc35afed672f6f25ff6744f9d428855163 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
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
|
|
|
| +#include "ash/root_window_controller.h"
|
| #include "ash/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| #include "base/command_line.h"
|
| @@ -88,9 +89,15 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
|
| }
|
|
|
| void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
|
| + if (!ash::Shell::HasInstance())
|
| + return;
|
| +
|
| // Initialize TabScrubber after the Ash Shell has been initialized.
|
| - if (ash::Shell::HasInstance())
|
| - TabScrubber::GetInstance();
|
| + TabScrubber::GetInstance();
|
| + // Activate virtual keyboard after profile is initialized. It depends on the
|
| + // default profile.
|
| + ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
|
| + ash::Shell::GetInstance()->keyboard_controller());
|
| }
|
|
|
| void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
|
|
|