diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 05:36:07 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 05:36:07 +0000 |
| commit | 12d5e64e06dfecf063464d4849a707050e1547f1 (patch) | |
| tree | 7aafeeb3b442fffaae9bd24fbb5cc5ba758252e6 /chromeos/ime | |
| parent | 7c625c207e990b41dbb07658df770419f60d25dc (diff) | |
| download | chromium_src-12d5e64e06dfecf063464d4849a707050e1547f1.zip chromium_src-12d5e64e06dfecf063464d4849a707050e1547f1.tar.gz chromium_src-12d5e64e06dfecf063464d4849a707050e1547f1.tar.bz2 | |
Remove mozc from whitelist.
BUG=236747
TEST=None
Review URL: https://chromiumcodereview.appspot.com/14564007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/ime')
| -rw-r--r-- | chromeos/ime/input_method_whitelist_unittest.cc | 5 | ||||
| -rw-r--r-- | chromeos/ime/input_methods.txt | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chromeos/ime/input_method_whitelist_unittest.cc b/chromeos/ime/input_method_whitelist_unittest.cc index eb4ed28..ec933b8 100644 --- a/chromeos/ime/input_method_whitelist_unittest.cc +++ b/chromeos/ime/input_method_whitelist_unittest.cc @@ -19,10 +19,11 @@ class InputMethodWhitelistTest : public testing::Test { } // namespace TEST_F(InputMethodWhitelistTest, TestInputMethodIdIsWhitelisted) { - EXPECT_TRUE(whitelist_.InputMethodIdIsWhitelisted("mozc")); + EXPECT_TRUE(whitelist_.InputMethodIdIsWhitelisted("pinyin")); EXPECT_TRUE(whitelist_.InputMethodIdIsWhitelisted("xkb:us:dvorak:eng")); EXPECT_FALSE(whitelist_.InputMethodIdIsWhitelisted("mozc,")); - EXPECT_FALSE(whitelist_.InputMethodIdIsWhitelisted("mozc,xkb:us:dvorak:eng")); + EXPECT_FALSE(whitelist_.InputMethodIdIsWhitelisted( + "mozc-pinyin,xkb:us:dvorak:eng")); EXPECT_FALSE(whitelist_.InputMethodIdIsWhitelisted("not-supported-id")); EXPECT_FALSE(whitelist_.InputMethodIdIsWhitelisted(",")); EXPECT_FALSE(whitelist_.InputMethodIdIsWhitelisted("")); diff --git a/chromeos/ime/input_methods.txt b/chromeos/ime/input_methods.txt index 38853cd..167cb8f 100644 --- a/chromeos/ime/input_methods.txt +++ b/chromeos/ime/input_methods.txt @@ -84,9 +84,6 @@ xkb:be::ger be de xkb:ch::ger ch de # Japanese -mozc us ja -mozc-jp jp ja -mozc-dv us(dvorak) ja # |kMozcJaInputMethodIds| in ibus_ui_controller.cc should also be updated when # a new Mozc Japanese IME for another keyboard layout is added. xkb:jp::jpn jp ja |