Commit df82c2f1 authored by shuchen's avatar shuchen Committed by Commit bot

Merges google_input_tools extension into google_xkb extension. The google...

Merges google_input_tools extension into google_xkb extension. The google input tools extension relative clean up will be in other CL.

BUG=709360
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

patch from issue 2894793002 at patchset 1 (http://crrev.com/2894793002#ps1)

Review-Url: https://codereview.chromium.org/2898873002
Cr-Commit-Position: refs/heads/master@{#473796}
parent df6416d2
...@@ -45,10 +45,6 @@ struct WhitelistedComponentExtensionIME { ...@@ -45,10 +45,6 @@ struct WhitelistedComponentExtensionIME {
// Official Google XKB Input. // Official Google XKB Input.
extension_ime_util::kXkbExtensionId, IDR_GOOGLE_XKB_MANIFEST, extension_ime_util::kXkbExtensionId, IDR_GOOGLE_XKB_MANIFEST,
}, },
{
// Google input tools.
extension_ime_util::kT13nExtensionId, IDR_GOOGLE_INPUT_TOOLS_MANIFEST,
},
#else #else
{ {
// Open-sourced ChromeOS xkb extension. // Open-sourced ChromeOS xkb extension.
......
...@@ -17,13 +17,13 @@ namespace extension_ime_util { ...@@ -17,13 +17,13 @@ namespace extension_ime_util {
#if defined(GOOGLE_CHROME_BUILD) #if defined(GOOGLE_CHROME_BUILD)
const char kXkbExtensionId[] = "jkghodnilhceideoidjikpgommlajknk"; const char kXkbExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
const char kM17nExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop"; const char kM17nExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo"; const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo";
const char kMozcExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop"; const char kMozcExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
const char kT13nExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop"; const char kT13nExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
const char kChinesePinyinExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop"; const char kChinesePinyinExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
const char kChineseZhuyinExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop"; const char kChineseZhuyinExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
const char kChineseCangjieExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop"; const char kChineseCangjieExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
#else #else
const char kXkbExtensionId[] = "fgoepimhcoialccpbmpnnblemnepkkao"; const char kXkbExtensionId[] = "fgoepimhcoialccpbmpnnblemnepkkao";
const char kM17nExtensionId[] = "jhffeifommiaekmbkkjlpmilogcfdohp"; const char kM17nExtensionId[] = "jhffeifommiaekmbkkjlpmilogcfdohp";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment