Index: ui/message_center/views/message_center_view.cc |
diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc |
index 136e77910309deabe089f273f5bdb9aff86887fb..bfd16856f762f5494350038835fee7ac99b0186a 100644 |
--- a/ui/message_center/views/message_center_view.cc |
+++ b/ui/message_center/views/message_center_view.cc |
@@ -24,7 +24,6 @@ |
#include "ui/views/border.h" |
#include "ui/views/controls/button/button.h" |
#include "ui/views/controls/button/label_button.h" |
-#include "ui/views/controls/button/text_button.h" |
#include "ui/views/controls/label.h" |
#include "ui/views/controls/scroll_view.h" |
#include "ui/views/controls/scrollbar/kennedy_scroll_bar.h" |
@@ -105,7 +104,7 @@ void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender, |
// NotificationCenterButton //////////////////////////////////////////////////// |
-class NotificationCenterButton : public views::TextButton { |
+class NotificationCenterButton : public views::LabelButton { |
public: |
NotificationCenterButton(views::ButtonListener* listener, |
const string16& text); |
@@ -125,11 +124,11 @@ class NotificationCenterButton : public views::TextButton { |
NotificationCenterButton::NotificationCenterButton( |
views::ButtonListener* listener, |
const string16& text) |
- : views::TextButton(listener, text) { |
+ : views::LabelButton(listener, text) { |
set_border(views::Border::CreateEmptyBorder(0, 16, 0, 16)); |
- set_min_height(kFooterHeight); |
- SetEnabledColor(kFooterTextColor); |
- SetHoverColor(kButtonTextHoverColor); |
+ set_min_size(gfx::Size(GetPreferredSize().width(), kFooterHeight)); |
msw
2013/04/20 00:08:20
nit: Use 0 width, like this: set_min_size(gfx::Siz
tfarina
2013/04/20 15:37:16
Done.
|
+ SetTextColor(STATE_NORMAL, kFooterTextColor); |
+ SetTextColor(STATE_HOVERED, kButtonTextHoverColor); |
} |
gfx::Size NotificationCenterButton::GetPreferredSize() { |
@@ -137,7 +136,7 @@ gfx::Size NotificationCenterButton::GetPreferredSize() { |
// GridLayout. |
if (!visible()) |
msw
2013/04/20 00:08:20
optional nit: use a ternary to make this a one-lin
tfarina
2013/04/20 15:37:16
Done.
|
return gfx::Size(); |
- return views::TextButton::GetPreferredSize(); |
+ return views::LabelButton::GetPreferredSize(); |
} |
void NotificationCenterButton::OnPaintBorder(gfx::Canvas* canvas) { |