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

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

Issue 178343005: [IME] migrate the xkb ID to extension based xkb ID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 16566b844bb7fc62ffcf0bc5f45afeeafde7e2c1..44048d6723273eddf36d191671ea5cd9e9fcc8ca 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -33,6 +33,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
+#include "chromeos/ime/extension_ime_util.h"
#include "chromeos/ime/input_method_manager.h"
#include "chromeos/ime/xkeyboard.h"
#include "chromeos/system/statistics_provider.h"
@@ -582,6 +583,12 @@ void Preferences::SetLanguageConfigStringListAsCSV(const char* section,
if (!value.empty())
base::SplitString(value, ',', &split_values);
+ // TODO(shuchen): migration of the xkb id to extension-xkb id.
+ // Remove this function after few milestones are passed.
+ // See: http://crbug.com/345604
+ if (input_method_manager_->MigrateXkbInputMethods(&split_values))
+ preload_engines_.SetValue(JoinString(split_values, ','));
+
if (section == std::string(language_prefs::kGeneralSectionName) &&
name == std::string(language_prefs::kPreloadEnginesConfigName)) {
input_method_manager_->ReplaceEnabledInputMethods(split_values);

Powered by Google App Engine
This is Rietveld 408576698