summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc5
-rw-r--r--chrome/browser/chromeos/input_method/input_method_util.cc2
-rw-r--r--chromeos/ime/extension_ime_util.h2
3 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
index f5faf4a..e2c5c0e 100644
--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -43,11 +43,6 @@ struct WhitelistedComponentExtensionIME {
"/usr/share/chromeos-assets/input_methods/google_xkb",
},
{
- // Official Google Keyboards Input.
- extension_ime_util::kM17nExtensionId,
- "/usr/share/chromeos-assets/input_methods/google_keyboards",
- },
- {
// Google input tools.
extension_ime_util::kT13nExtensionId,
"/usr/share/chromeos-assets/input_methods/input_tools",
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 05e9aeb..2b55dcb 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -163,6 +163,8 @@ const char* const kXkbIndicators[][2] = {{"am", "AM"},
const char* const kExtensionIdMigrationMap[][2] = {
// Official Japanese IME extension ID.
{"fpfbhcjppmaeaijcidgiibchfbnhbelj", "gjaehgfemfahhmlgpdfknkhdnemmolop"},
+ // Official M17n keyboard extension ID.
+ {"habcdindjejkmepknlhkkloncjcpcnbf", "gjaehgfemfahhmlgpdfknkhdnemmolop"},
};
const size_t kExtensionIdLen = 32;
diff --git a/chromeos/ime/extension_ime_util.h b/chromeos/ime/extension_ime_util.h
index 2bfc42b..a8e2933 100644
--- a/chromeos/ime/extension_ime_util.h
+++ b/chromeos/ime/extension_ime_util.h
@@ -17,7 +17,7 @@ namespace extension_ime_util {
#if defined(OFFICIAL_BUILD)
const char kXkbExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kM17nExtensionId[] = "habcdindjejkmepknlhkkloncjcpcnbf";
+const char kM17nExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop";
const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo";
const char kMozcExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop";
const char kT13nExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop";