diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 22:04:47 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 22:04:47 +0000 |
| commit | 2e8cdcc69db85eabbed3d1f9675d5e904debeb4d (patch) | |
| tree | 7eda6b9103a5be920d75089e3136a210a507d06e | |
| parent | a30ebc78a4019702c1d589ee62d80cb86f51e88d (diff) | |
| download | chromium_src-2e8cdcc69db85eabbed3d1f9675d5e904debeb4d.zip chromium_src-2e8cdcc69db85eabbed3d1f9675d5e904debeb4d.tar.gz chromium_src-2e8cdcc69db85eabbed3d1f9675d5e904debeb4d.tar.bz2 | |
Remove mystery keyboard layout from Chrome OS.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/20258002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215129 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc | 11 | ||||
| -rw-r--r-- | chromeos/ime/input_methods.txt | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index 978007e..d0547bd 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc @@ -306,15 +306,8 @@ TEST_F(InputMethodManagerImplTest, TestEnableLayouts) { InitIBusBus(); manager_->EnableLayouts("en-US", ""); EXPECT_EQ(5U, manager_->GetNumActiveInputMethods()); - { - // For http://crbug.com/19655#c11 - (1) - scoped_ptr<InputMethodDescriptors> methods( - manager_->GetActiveInputMethods()); - const InputMethodDescriptor* id_to_find = - manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId( - "english-m"); // The "English Mystery" IME. - EXPECT_FALSE(Contain(*methods.get(), *id_to_find)); - } + for (size_t i = 0; i < manager_->GetActiveInputMethodIds().size(); ++i) + LOG(ERROR) << manager_->GetActiveInputMethodIds().at(i); // For http://crbug.com/19655#c11 - (2) EXPECT_EQ(0, mock_ibus_daemon_controller_->start_count()); diff --git a/chromeos/ime/input_methods.txt b/chromeos/ime/input_methods.txt index 220b322..2b4bc91 100644 --- a/chromeos/ime/input_methods.txt +++ b/chromeos/ime/input_methods.txt @@ -72,7 +72,6 @@ xkb:us:intl:eng us(intl) en-US xkb:us:altgr-intl:eng us(altgr-intl) en-US xkb:us:dvorak:eng us(dvorak) en-US xkb:us:colemak:eng us(colemak) en-US -english-m us en-US # U.S. English entiries have to be above the Dutch entry so that xkb:us:intl:eng # will be selected as the default keyboard when the UI language is set to Dutch. |