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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 9999018: chrome/browser/chromeos/input_method/ refactoring [part 6 of 6] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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
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
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | chrome/browser/chromeos/extensions/input_method_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698