Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2354)

Unified Diff: ash/content/shell_content_state.cc

Issue 1392713002: Extract content dependency from keyboard code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ash/ash.gyp ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698