| Index: chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| index 4b6e71f6b22600ef4679cf474349dad1b9aaea05..a69cdc4d0e3e1a678d5a7264bba3939c83f3f518 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| @@ -4,11 +4,9 @@
|
|
|
| #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h"
|
|
|
| -#include "base/prefs/public/pref_service_base.h"
|
| +#include "base/logging.h"
|
| #include "chrome/browser/browser_process.h"
|
| -#include "chrome/browser/chromeos/language_preferences.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/profiles/profile_manager.h"
|
| +#include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/common/pref_names.h"
|
|
|
| namespace chromeos {
|
| @@ -16,40 +14,6 @@ namespace input_method {
|
|
|
| InputMethodDelegateImpl::InputMethodDelegateImpl() {}
|
|
|
| -void InputMethodDelegateImpl::SetSystemInputMethod(
|
| - const std::string& input_method) {
|
| - if (g_browser_process) {
|
| - PrefServiceBase* local_state = g_browser_process->local_state();
|
| - if (local_state) {
|
| - local_state->SetString(language_prefs::kPreferredKeyboardLayout,
|
| - input_method);
|
| - return;
|
| - }
|
| - }
|
| -
|
| - NOTREACHED();
|
| -}
|
| -
|
| -void InputMethodDelegateImpl::SetUserInputMethod(
|
| - const std::string& input_method) {
|
| - PrefServiceBase* user_prefs = NULL;
|
| - Profile* profile = ProfileManager::GetDefaultProfile();
|
| - if (profile)
|
| - user_prefs = profile->GetPrefs();
|
| - if (!user_prefs)
|
| - return;
|
| -
|
| - const std::string current_input_method_on_pref =
|
| - user_prefs->GetString(prefs::kLanguageCurrentInputMethod);
|
| - if (current_input_method_on_pref == input_method)
|
| - return;
|
| -
|
| - user_prefs->SetString(prefs::kLanguagePreviousInputMethod,
|
| - current_input_method_on_pref);
|
| - user_prefs->SetString(prefs::kLanguageCurrentInputMethod,
|
| - input_method);
|
| -}
|
| -
|
| std::string InputMethodDelegateImpl::GetHardwareKeyboardLayout() const {
|
| if (g_browser_process) {
|
| PrefServiceBase* local_state = g_browser_process->local_state();
|
|
|