| Index: ash/content/shell_content_state.cc
|
| diff --git a/ash/content/shell_content_state.cc b/ash/content/shell_content_state.cc
|
| index d40ba6d8b220f5b406d8ca9e476a8e7f8b281b4d..990c27c0d524e3617f3a4a87ac2e9d1bfb2aadc0 100644
|
| --- a/ash/content/shell_content_state.cc
|
| +++ b/ash/content/shell_content_state.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ash/content/shell_content_state.h"
|
|
|
| #include "base/logging.h"
|
| +#include "ui/keyboard/content/keyboard.h"
|
|
|
| namespace ash {
|
|
|
| @@ -30,7 +31,13 @@ void ShellContentState::DestroyInstance() {
|
| instance_ = nullptr;
|
| }
|
|
|
| -ShellContentState::ShellContentState() {}
|
| +ShellContentState::ShellContentState() {
|
| +// The keyboard system must be initialized before the RootWindowController is
|
| +// created.
|
| +#if defined(OS_CHROMEOS)
|
| + keyboard::InitializeKeyboard();
|
| +#endif
|
| +}
|
| ShellContentState::~ShellContentState() {}
|
|
|
| } // namespace ash
|
|
|