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

chrome/browser/chromeos/preferences.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/preferences.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
@@ skipping 605 matching lines @@
 
 void Preferences::SetLanguageConfigStringListAsCSV(const char* section,
                                                    const char* name,
                                                    const std::string& value) {
   VLOG(1) << "Setting " << name << " to '" << value << "'";
 
   std::vector<std::string> split_values;
   if (!value.empty())
     base::SplitString(value, ',', &split_values);
 
+  if (section == std::string(language_prefs::kGeneralSectionName) &&
+      name == std::string(language_prefs::kPreloadEnginesConfigName)) {
+    input_method_manager_->EnableInputMethods(split_values);
+    return;
+  }
+
   // We should call the cros API even when |value| is empty, to disable default
   // config.
   SetLanguageConfigStringList(section, name, split_values);
 }
 
 void Preferences::SetInputMethodList() {
   // When |preload_engines_| are set, InputMethodManager::ChangeInputMethod()
   // might be called to change the current input method to the first one in the
   // |preload_engines_| list. This also updates previous/current input method
   // prefs. That's why GetValue() calls are placed before the
@@ skipping 51 matching lines @@
     return;
 
   input_method::AutoRepeatRate rate;
   rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
   rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
   DCHECK(rate.initial_delay_in_ms > 0);
   DCHECK(rate.repeat_interval_in_ms > 0);
   input_method::XKeyboard::SetAutoRepeatRate(rate);
 }
 
 void Preferences::UpdateVirturalKeyboardPreference(PrefService* prefs) {

[kinaba, 2012/04/13 08:08:53]

Not directly related to this CL, but could you add
"// static" before this method definition as done for
Preferences::RegisterUserPrefs? (regarding my overlook of staticness in
http://codereview.chromium.org/10027008/ :)).

[Yusuke Sato, 2012/04/13 08:59:28]

Done.

   const DictionaryValue* virtual_keyboard_pref =
       prefs->GetDictionary(prefs::kLanguagePreferredVirtualKeyboard);
   DCHECK(virtual_keyboard_pref);
 
-  input_method::InputMethodManager* input_method_manager =
-      input_method::InputMethodManager::GetInstance();
-  input_method_manager->ClearAllVirtualKeyboardPreferences();
-
+  // TODO(yusukes): Clear all virtual keyboard preferences here.
   std::string url;
   std::vector<std::string> layouts_to_remove;
   for (DictionaryValue::key_iterator iter = virtual_keyboard_pref->begin_keys();
        iter != virtual_keyboard_pref->end_keys();
        ++iter) {
     const std::string& layout_id = *iter;  // e.g. "us", "handwriting-vk"
     if (!virtual_keyboard_pref->GetString(layout_id, &url))
       continue;
-    if (!input_method_manager->SetVirtualKeyboardPreference(
-            layout_id, GURL(url))) {
-      // Either |layout_id| or |url| is invalid. Remove the key from |prefs|
-      // later.
-      layouts_to_remove.push_back(layout_id);
-      LOG(ERROR) << "Removing invalid virtual keyboard pref: layout="
-                 << layout_id;
-    }
+    // TODO(yusukes): add the virtual keyboard preferences here.
   }
 
   // Remove invalid prefs.
   DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard);
   DictionaryValue* pref_value = updater.Get();
   for (size_t i = 0; i < layouts_to_remove.size(); ++i) {
     pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL);
   }
 }
 
 }  // namespace chromeos