diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 02:10:21 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 02:10:21 +0000 |
| commit | 6ad9d64479d6f7a84862a74b3290edfeba4bd0da (patch) | |
| tree | 26f9dd0cf35a90bfd09b3637fed56b11cfa21199 /apps | |
| parent | be308b8159d016948dd10bc4dd2801e3b0a9fcd8 (diff) | |
| download | chromium_src-6ad9d64479d6f7a84862a74b3290edfeba4bd0da.zip chromium_src-6ad9d64479d6f7a84862a74b3290edfeba4bd0da.tar.gz chromium_src-6ad9d64479d6f7a84862a74b3290edfeba4bd0da.tar.bz2 | |
Fix app_shell CHECK failure on startup on Linux
It needs the input method system initialized. Use a test input method since app_shell on Linux is just a convenience for developers.
BUG=381852
TEST=app_shell_browsertests
Review URL: https://codereview.chromium.org/314423003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell/browser/shell_browser_main_parts.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc index 3dbfb7c..7c1d293 100644 --- a/apps/shell/browser/shell_browser_main_parts.cc +++ b/apps/shell/browser/shell_browser_main_parts.cc @@ -19,6 +19,7 @@ #include "extensions/browser/browser_context_keyed_service_factories.h" #include "extensions/browser/extension_system.h" #include "ui/aura/window_tree_host.h" +#include "ui/base/ime/input_method_initializer.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) @@ -64,6 +65,9 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() { #if defined(OS_CHROMEOS) chromeos::DBusThreadManager::Initialize(); network_controller_.reset(new ShellNetworkController); +#else + // Non-Chrome OS platforms are for developer convenience, so use a test IME. + ui::InitializeInputMethodForTesting(); #endif } |