message_center: Convert NotificationCenterButton to LabelButton.

ui/message_center/views/message_center_view.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/views/message_center_view.h"
 
 #include <map>
 
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/message_center/views/notification_view.h"
 #include "ui/views/background.h"
 #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"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 
 namespace message_center {
@@ skipping 60 matching lines @@
 }
 
 void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender,
                                                const ui::Event& event) {
   if (sender == close_all_button())
     message_center()->RemoveAllNotifications(true);  // Action by user.
 }
 
 // NotificationCenterButton ////////////////////////////////////////////////////
 
-class NotificationCenterButton : public views::TextButton {
+class NotificationCenterButton : public views::LabelButton {
  public:
   NotificationCenterButton(views::ButtonListener* listener,
                            const string16& text);
 
   // Overridden from views::View:

[msw, 2013/04/20 00:08:20]

nit: // Overridden from views::LabelButton:

[tfarina, 2013/04/20 15:37:16]

Done.

   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  protected:
   // Overridden from views::View:
   virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NotificationCenterButton);
 };
 
 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::Size(0, kFooterHeight));
(this means that the button's width won't have an enforced minimum size)

[tfarina, 2013/04/20 15:37:16]

Done.

+  SetTextColor(STATE_NORMAL, kFooterTextColor);
+  SetTextColor(STATE_HOVERED, kButtonTextHoverColor);
 }
 
 gfx::Size NotificationCenterButton::GetPreferredSize() {
   // Returns an empty size when invisible, to trim its space in the parent's

[msw, 2013/04/20 00:08:20]

optional nit: remove "parent's" and this becomes a one-liner.

[tfarina, 2013/04/20 15:37:16]

Done.

   // GridLayout.
   if (!visible())

[msw, 2013/04/20 00:08:20]

optional nit: use a ternary to make this a one-liner:
return visible() ? views::LabelButton::GetPreferredSize() : gfx::Size();

[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) {
   // Just paint the left border.
   canvas->DrawLine(gfx::Point(0, 0), gfx::Point(0, height()),
                    kFooterDelimiterColor);
 }
 
 void NotificationCenterButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
@@ skipping 298 matching lines @@
   // NotificationViews are expanded by default here until
   // http://crbug.com/217902 is fixed. TODO(dharcourt): Fix.
   MessageView* view = NotificationView::Create(
       notification, message_center_, true);
   view->set_scroller(scroller_);
   message_views_[notification.id()] = view;
   message_list_view_->AddChildView(view);
 }
 
 }  // namespace message_center