Index: chrome/browser/chromeos/status/input_method_menu_button.cc |
diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc |
index 10911be0de5bb86628f377a5ad2c9f58388c70a4..c0e2fdfe077dbb6f130c2b04f933e2ecaef32a32 100644 |
--- a/chrome/browser/chromeos/status/input_method_menu_button.cc |
+++ b/chrome/browser/chromeos/status/input_method_menu_button.cc |
@@ -15,7 +15,6 @@ |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_list.h" |
#include "chrome/browser/ui/browser_window.h" |
-#include "ui/base/resource/resource_bundle.h" |
#include "views/window/window.h" |
namespace { |
@@ -29,12 +28,6 @@ PrefService* GetPrefService(chromeos::StatusAreaHost* host) { |
return NULL; |
} |
-#if defined(CROS_FONTS_USING_BCI) |
-const int kFontSizeDelta = 0; |
-#else |
-const int kFontSizeDelta = 1; |
-#endif |
- |
// A class which implements interfaces of chromeos::InputMethodMenu. This class |
// is just for avoiding multiple inheritance. |
class MenuImpl : public chromeos::InputMethodMenu { |
@@ -72,18 +65,8 @@ namespace chromeos { |
// InputMethodMenuButton |
InputMethodMenuButton::InputMethodMenuButton(StatusAreaHost* host) |
- : StatusAreaButton(this), |
- menu_(new MenuImpl(this, GetPrefService(host), host->GetScreenMode())), |
- host_(host) { |
- set_border(NULL); |
- set_use_menu_button_paint(true); |
- SetFont(ResourceBundle::GetSharedInstance().GetFont( |
- ResourceBundle::BaseFont).DeriveFont(kFontSizeDelta)); |
- SetEnabledColor(0xB3FFFFFF); // White with 70% Alpha |
- SetDisabledColor(0x00FFFFFF); // White with 00% Alpha (invisible) |
- SetShowMultipleIconStates(false); |
- set_alignment(TextButton::ALIGN_CENTER); |
- |
+ : StatusAreaButton(host, this), |
+ menu_(new MenuImpl(this, GetPrefService(host), host->GetScreenMode())) { |
UpdateUIFromCurrentInputMethod(); |
} |