Commit dd11160d authored by tfarina@chromium.org's avatar tfarina@chromium.org

message_center: Convert NotificationCenterButton to LabelButton.

BUG=155363
R=msw@chromium.org,mukai@chromium.org

Review URL: https://codereview.chromium.org/13879011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195401 0039d316-1c4b-4281-b951-d872f2087c98
parent 61feca81
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "ui/views/border.h" #include "ui/views/border.h"
#include "ui/views/controls/button/button.h" #include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/label_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/label.h"
#include "ui/views/controls/scroll_view.h" #include "ui/views/controls/scroll_view.h"
#include "ui/views/controls/scrollbar/kennedy_scroll_bar.h" #include "ui/views/controls/scrollbar/kennedy_scroll_bar.h"
...@@ -105,12 +104,12 @@ void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender, ...@@ -105,12 +104,12 @@ void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender,
// NotificationCenterButton //////////////////////////////////////////////////// // NotificationCenterButton ////////////////////////////////////////////////////
class NotificationCenterButton : public views::TextButton { class NotificationCenterButton : public views::LabelButton {
public: public:
NotificationCenterButton(views::ButtonListener* listener, NotificationCenterButton(views::ButtonListener* listener,
const string16& text); const string16& text);
// Overridden from views::View: // Overridden from views::LabelButton:
virtual gfx::Size GetPreferredSize() OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE;
protected: protected:
...@@ -125,19 +124,16 @@ class NotificationCenterButton : public views::TextButton { ...@@ -125,19 +124,16 @@ class NotificationCenterButton : public views::TextButton {
NotificationCenterButton::NotificationCenterButton( NotificationCenterButton::NotificationCenterButton(
views::ButtonListener* listener, views::ButtonListener* listener,
const string16& text) const string16& text)
: views::TextButton(listener, text) { : views::LabelButton(listener, text) {
set_border(views::Border::CreateEmptyBorder(0, 16, 0, 16)); set_border(views::Border::CreateEmptyBorder(0, 16, 0, 16));
set_min_height(kFooterHeight); set_min_size(gfx::Size(0, kFooterHeight));
SetEnabledColor(kFooterTextColor); SetTextColor(STATE_NORMAL, kFooterTextColor);
SetHoverColor(kButtonTextHoverColor); SetTextColor(STATE_HOVERED, kButtonTextHoverColor);
} }
gfx::Size NotificationCenterButton::GetPreferredSize() { gfx::Size NotificationCenterButton::GetPreferredSize() {
// Returns an empty size when invisible, to trim its space in the parent's // Returns an empty size when invisible, to trim its space in the GridLayout.
// GridLayout. return visible() ? views::LabelButton::GetPreferredSize() : gfx::Size();
if (!visible())
return gfx::Size();
return views::TextButton::GetPreferredSize();
} }
void NotificationCenterButton::OnPaintBorder(gfx::Canvas* canvas) { void NotificationCenterButton::OnPaintBorder(gfx::Canvas* canvas) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment