chrome/browser/chromeos/input_method/ refactoring [part 6 of 6]

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #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"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 #include "chrome/browser/chromeos/disks/disk_mount_manager.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
@@ skipping 176 matching lines @@
   chromeos::disks::DiskMountManager::Shutdown();
 
   // CrosLibrary is shut down before DBusThreadManager even though the former
   // is initialized before the latter becuase some of its libraries depend
   // on DBus clients.
   // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
   // (crosbug.com/26160)
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
     chromeos::CrosLibrary::Shutdown();
 
+  chromeos::input_method::InputMethodManager::Shutdown();
+
   chromeos::CrosDBusService::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 }
 
@@ skipping 44 matching lines @@
 
   // Initialize the network change notifier for Chrome OS. The network
   // change notifier starts to monitor changes from the power manager and
   // the network manager.
   chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
 
   // Likewise, initialize the upgrade detector for Chrome OS. The upgrade
   // 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
     // netbooks do not work as intended when Num Lock is on (e.g. On a netbook
     // with a small keyboard, u, i, o, p, ... keys might be repurposed as
     // cursor keys when Num Lock is on).
 #if defined(GOOGLE_CHROME_BUILD)
     chromeos::input_method::InputMethodManager::GetInstance()->
         GetXKeyboard()->SetNumLockEnabled(true);
 #endif
@@ skipping 203 matching lines @@
 
   // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell
   // singleton before the shell is destroyed.
   video_property_writer_.reset();
   // Remove PowerButtonObserver attached to a D-Bus client before
   // DBusThreadManager is shut down.
   power_button_observer_.reset();
 
   ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
 }