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

chrome/browser/chromeos/login/screen_locker.cc

Index: chrome/browser/chromeos/login/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 328c74b69973e3397dbb5eb56d9fa05c2871eb12..a982d42df56527b5b85cc2d9bd79f9ed27be47a4 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -16,10 +16,6 @@
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
-#include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
@@ -94,7 +90,6 @@ class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
   virtual void LockScreen() OVERRIDE {
     VLOG(1) << "In: ScreenLockObserver::LockScreen";
     if (session_started_) {
-      SetupInputMethodsForScreenLocker();
       chromeos::ScreenLocker::Show();
     } else {
       // If the user has not completed the sign in we will log them out. This
@@ -107,7 +102,6 @@ class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
   }
 
   virtual void UnlockScreen() OVERRIDE {
-    RestoreInputMethods();
     chromeos::ScreenLocker::Hide();
   }
 
@@ -116,86 +110,6 @@ class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
   }
 
  private:
-  // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic)
-  // since they are not necessary to input a login password. Users are still
-  // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak,
-  // French).
-  void SetupInputMethodsForScreenLocker() {
-    if (// The LockScreen function is also called when the OS is suspended, and
-        // in that case |saved_active_input_method_list_| might be non-empty.
-        saved_active_input_method_list_.empty()) {
-      chromeos::input_method::InputMethodManager* manager =
-          chromeos::input_method::InputMethodManager::GetInstance();
-
-      saved_previous_input_method_id_ = manager->GetPreviousInputMethod().id();
-      saved_current_input_method_id_ = manager->GetCurrentInputMethod().id();
-      scoped_ptr<chromeos::input_method::InputMethodDescriptors>
-          active_input_method_list(manager->GetActiveInputMethods());
-
-      const std::string hardware_keyboard_id =
-          manager->GetInputMethodUtil()->GetHardwareInputMethodId();
-      // We'll add the hardware keyboard if it's not included in
-      // |active_input_method_list| so that the user can always use the hardware
-      // keyboard on the screen locker.
-      bool should_add_hardware_keyboard = true;
-
-      chromeos::input_method::InputMethodConfigValue value;
-      value.type =
-          chromeos::input_method::InputMethodConfigValue::kValueTypeStringList;
-      for (size_t i = 0; i < active_input_method_list->size(); ++i) {
-        const std::string& input_method_id =
-            active_input_method_list->at(i).id();
-        saved_active_input_method_list_.push_back(input_method_id);
-        // Skip if it's not a keyboard layout.
-        if (!chromeos::input_method::InputMethodUtil::IsKeyboardLayout(
-                input_method_id))
-          continue;
-        value.string_list_value.push_back(input_method_id);
-        if (input_method_id == hardware_keyboard_id) {
-          should_add_hardware_keyboard = false;
-        }
-      }
-      if (should_add_hardware_keyboard) {
-        value.string_list_value.push_back(hardware_keyboard_id);
-      }
-      // We don't want to shut down the IME, even if the hardware layout is the
-      // only IME left.
-      manager->SetEnableAutoImeShutdown(false);
-      manager->SetEnableExtensionIMEs(false);
-      manager->SetInputMethodConfig(
-          chromeos::language_prefs::kGeneralSectionName,
-          chromeos::language_prefs::kPreloadEnginesConfigName,
-          value);
-    }
-  }
-
-  void RestoreInputMethods() {
-    if (!saved_active_input_method_list_.empty()) {
-      chromeos::input_method::InputMethodManager* manager =
-          chromeos::input_method::InputMethodManager::GetInstance();
-
-      chromeos::input_method::InputMethodConfigValue value;
-      value.type =
-          chromeos::input_method::InputMethodConfigValue::kValueTypeStringList;
-      value.string_list_value = saved_active_input_method_list_;
-      manager->SetEnableAutoImeShutdown(true);
-      manager->SetEnableExtensionIMEs(true);
-      manager->SetInputMethodConfig(
-          chromeos::language_prefs::kGeneralSectionName,
-          chromeos::language_prefs::kPreloadEnginesConfigName,
-          value);
-      // Send previous input method id first so Ctrl+space would work fine.
-      if (!saved_previous_input_method_id_.empty())
-        manager->ChangeInputMethod(saved_previous_input_method_id_);
-      if (!saved_current_input_method_id_.empty())
-        manager->ChangeInputMethod(saved_current_input_method_id_);
-
-      saved_previous_input_method_id_.clear();
-      saved_current_input_method_id_.clear();
-      saved_active_input_method_list_.clear();
-    }
-  }
-
   bool session_started_;
   content::NotificationRegistrar registrar_;
   std::string saved_previous_input_method_id_;