summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/status/language_menu_button.cc
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 03:47:30 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 03:47:30 +0000
commit0034f9391f33cdcaaaee7cc8202d799d383910c1 (patch)
tree53909090d5a399fd12f2263ccaf911efaae9682c /chrome/browser/chromeos/status/language_menu_button.cc
parentc243ab0e7f83f384802cb49da374c0124f01f69e (diff)
downloadchromium_src-0034f9391f33cdcaaaee7cc8202d799d383910c1.zip
chromium_src-0034f9391f33cdcaaaee7cc8202d799d383910c1.tar.gz
chromium_src-0034f9391f33cdcaaaee7cc8202d799d383910c1.tar.bz2
Don't use disabled (gray) state for the language indicator.
BUG=chromium-os:3683 TEST=manual Review URL: http://codereview.chromium.org/2767001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/language_menu_button.cc')
-rw-r--r--chrome/browser/chromeos/status/language_menu_button.cc16
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index e45dcf5..ead895e6 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.cc
@@ -149,12 +149,6 @@ LanguageMenuButton::LanguageMenuButton(StatusAreaHost* host)
SetFont(ResourceBundle::GetSharedInstance().GetFont(
ResourceBundle::BaseFont).DeriveFont(1, gfx::Font::BOLD));
SetEnabledColor(0xB3FFFFFF); // White with 70% Alpha
-
- // TODO(yusukes): Make the initial state "enabled" and delete SetDisabledColor
- // when crosbug.com/3683 is fixed.
- SetDisabledColor(0x4DFFFFFF); // White with 30% Alpha
- SetEnabled(false); // Disable the button until the first FocusIn comes in.
-
SetShowHighlighted(false);
// Update the model
RebuildModel();
@@ -433,16 +427,6 @@ void LanguageMenuButton::LocaleChanged() {
SchedulePaint();
}
-void LanguageMenuButton::FocusChanged(LanguageLibrary* obj) {
- // TODO(yusukes): Remove this function when crosbug.com/3683 is fixed.
- LanguageLibrary* language_library = CrosLibrary::Get()->GetLanguageLibrary();
- if (language_library->is_focused() && !IsEnabled()) {
- // Enable the button on the first FocusIn event.
- SetEnabled(true);
- SchedulePaint();
- }
-}
-
void LanguageMenuButton::UpdateIcon(
const std::wstring& name, const std::wstring& tooltip) {
if (!tooltip.empty()) {