Index: chrome/browser/chromeos/status/language_menu_button.cc |
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc |
index e45dcf56853b5bb8445229fe4269d5ce6c5811a8..ead895e64e582cf1f662598c98b1f2ec72fa2bc7 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()) { |