Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index 7e0123a679b8773c4255576da75fa38a5fbc89d0..41829ac0f8e850986cf12c6171d6306c63b77912 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -11,6 +11,7 @@ |
#include "base/lazy_instance.h" |
#include "base/message_loop.h" |
#include "base/string_number_conversions.h" |
+#include "base/string_split.h" |
#include "chrome/browser/browser_process_impl.h" |
#include "chrome/browser/chromeos/audio/audio_handler.h" |
#include "chrome/browser/chromeos/background/desktop_background_observer.h" |
@@ -207,6 +208,8 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { |
if (!parameters().ui_task && chromeos::CrosLibrary::Get()) |
chromeos::CrosLibrary::Shutdown(); |
+ chromeos::input_method::InputMethodManager::Shutdown(); |
+ |
chromeos::CrosDBusService::Shutdown(); |
chromeos::DBusThreadManager::Shutdown(); |
@@ -271,6 +274,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() { |
// detector starts to monitor changes from the update engine. |
UpgradeDetectorChromeos::GetInstance()->Init(); |
+ // This function and SystemKeyEventListener use InputMethodManager. |
+ chromeos::input_method::InputMethodManager::Initialize(); |
+ |
if (base::chromeos::IsRunningOnChromeOS()) { |
// Enable Num Lock on X start up for http://crosbug.com/p/5795 and |
// http://crosbug.com/p/6245. We don't do this for Chromium OS since many |