| Index: ash/common/system/tray/tray_popup_header_button.cc
|
| diff --git a/ash/common/system/tray/tray_popup_header_button.cc b/ash/common/system/tray/tray_popup_header_button.cc
|
| index b37cae26076f1f58ca6092d237705f969931ae74..bb15d503600002a69ca0f4375af118ccb5f9873b 100644
|
| --- a/ash/common/system/tray/tray_popup_header_button.cc
|
| +++ b/ash/common/system/tray/tray_popup_header_button.cc
|
| @@ -17,15 +17,29 @@ const char TrayPopupHeaderButton::kViewClassName[] =
|
| "tray/TrayPopupHeaderButton";
|
|
|
| TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
|
| + int icon_resource_id,
|
| + int accessible_name_id)
|
| + : views::ToggleImageButton(listener) {
|
| + ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
|
| + SetImage(views::Button::STATE_NORMAL,
|
| + bundle.GetImageNamed(icon_resource_id).ToImageSkia());
|
| + SetImageAlignment(views::ImageButton::ALIGN_CENTER,
|
| + views::ImageButton::ALIGN_MIDDLE);
|
| + SetAccessibleName(bundle.GetLocalizedString(accessible_name_id));
|
| + SetFocusForPlatform();
|
| +
|
| + SetFocusPainter(views::Painter::CreateSolidFocusPainter(
|
| + kFocusBorderColor, gfx::Insets(1, 2, 2, 3)));
|
| +}
|
| +
|
| +TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
|
| int enabled_resource_id,
|
| int disabled_resource_id,
|
| int enabled_resource_id_hover,
|
| int disabled_resource_id_hover,
|
| int accessible_name_id)
|
| - : views::ToggleImageButton(listener) {
|
| + : TrayPopupHeaderButton(listener, enabled_resource_id, accessible_name_id) {
|
| ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
|
| - SetImage(views::Button::STATE_NORMAL,
|
| - bundle.GetImageNamed(enabled_resource_id).ToImageSkia());
|
| SetToggledImage(views::Button::STATE_NORMAL,
|
| bundle.GetImageNamed(disabled_resource_id).ToImageSkia());
|
| SetImage(views::Button::STATE_HOVERED,
|
| @@ -33,13 +47,6 @@ TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
|
| SetToggledImage(
|
| views::Button::STATE_HOVERED,
|
| bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia());
|
| - SetImageAlignment(views::ImageButton::ALIGN_CENTER,
|
| - views::ImageButton::ALIGN_MIDDLE);
|
| - SetAccessibleName(bundle.GetLocalizedString(accessible_name_id));
|
| - SetFocusForPlatform();
|
| -
|
| - SetFocusPainter(views::Painter::CreateSolidFocusPainter(
|
| - kFocusBorderColor, gfx::Insets(1, 2, 2, 3)));
|
| }
|
|
|
| TrayPopupHeaderButton::~TrayPopupHeaderButton() {}
|
|
|