| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index 8a52e327f9a37af30d10241a9ab5703c036d5eb8..79c1a93604ae621032946710a7fd73e5a591d821 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -617,6 +617,9 @@ void RootWindowController::DeactivateKeyboard(
|
| return;
|
|
|
| DCHECK(keyboard_controller);
|
| + if (!keyboard_controller->keyboard_container_initialized())
|
| + return;
|
| +
|
| aura::Window* keyboard_container =
|
| keyboard_controller->GetContainerWindow();
|
| if (keyboard_container->GetRootWindow() == root_window()) {
|
|
|