diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 03:32:24 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 03:32:24 +0000 |
| commit | 39583e92482f6a1351de658df5c33541b8cc3a63 (patch) | |
| tree | a7efea537a4a0c63106e593b045ab6e6226b1880 | |
| parent | 4f4d358d06e8f4e68f98d688cf4acd99de1ba29a (diff) | |
| download | chromium_src-39583e92482f6a1351de658df5c33541b8cc3a63.zip chromium_src-39583e92482f6a1351de658df5c33541b8cc3a63.tar.gz chromium_src-39583e92482f6a1351de658df5c33541b8cc3a63.tar.bz2 | |
Remove obsolete code from InputMethodMenuButton
Showing US by default is no longer necessary.
By default (when there is only one input method),
we don't show the indicator.
BUG=chromium-os:11528
TEST=confirm the input method menu works as before
Review URL: http://codereview.chromium.org/6386048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73422 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/input_method_menu_button.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc index 1767b49..31734c8 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button.cc +++ b/chrome/browser/chromeos/status/input_method_menu_button.cc @@ -80,17 +80,6 @@ InputMethodMenuButton::InputMethodMenuButton(StatusAreaHost* host) SetDisabledColor(0x00FFFFFF); // White with 00% Alpha (invisible) SetShowMultipleIconStates(false); set_alignment(TextButton::ALIGN_CENTER); - - chromeos::KeyboardLibrary* keyboard_library = - chromeos::CrosLibrary::Get()->GetKeyboardLibrary(); - const std::string hardware_keyboard_id = // e.g. "xkb:us::eng" - keyboard_library->GetHardwareKeyboardLayoutName(); - - // Draw the default indicator "US". The default indicator "US" is used when - // |pref_service| is not available (for example, unit tests) or |pref_service| - // is available, but Chrome preferences are not available (for example, - // initial OS boot). - UpdateUI(hardware_keyboard_id, L"US", L"", 1); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc b/chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc index ca9e9fe..3216fba 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc +++ b/chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc @@ -38,10 +38,9 @@ IN_PROC_BROWSER_TEST_F(InputMethodMenuButtonTest, InitialIndicatorTest) { InputMethodMenuButton* input_method = GetInputMethodMenuButton(); ASSERT_TRUE(input_method != NULL); - // Since the default input method is "xkb:us::eng", "US" should be set for the - // indicator. + // By default, we don't show the indicator text. std::wstring indicator = input_method->text(); - EXPECT_EQ(L"US", indicator); + EXPECT_EQ(L"", indicator); } } // namespace chromeos |