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

Unified Diff: ash/content/shell_content_state.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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/content/shell_content_state.h ('k') | ash/dip_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 990c27c0d524e3617f3a4a87ac2e9d1bfb2aadc0..f9abb727609c36db9e8a04e46fd75e6ecaf9acd5 100644
--- a/ash/content/shell_content_state.cc
+++ b/ash/content/shell_content_state.cc
@@ -32,12 +32,11 @@ void ShellContentState::DestroyInstance() {
}
ShellContentState::ShellContentState() {
-// The keyboard system must be initialized before the RootWindowController is
-// created.
-#if defined(OS_CHROMEOS)
+ // The keyboard system must be initialized before the RootWindowController is
+ // created.
keyboard::InitializeKeyboard();
-#endif
}
+
ShellContentState::~ShellContentState() {}
} // namespace ash
« no previous file with comments | « ash/content/shell_content_state.h ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698