views: Move MenuButton from TextButton to LabelButton.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 53 matching lines @@
 #include "grit/ui_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/text_constants.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/button_drag_utils.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/metrics.h"
 #include "ui/views/view_constants.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 using base::UserMetricsAction;
 using content::OpenURLParams;
 using content::PageNavigator;
 using content::Referrer;
 using ui::DropTargetEvent;
 using views::CustomButton;
+using views::LabelButtonBorder;
 using views::MenuButton;
 using views::View;
 
 // Margins around the content.
 static const int kDetachedTopMargin = 1;  // When attached, we use 0 and let the
                                           // toolbar above serve as the margin.
 static const int kBottomMargin = 2;
 static const int kLeftMargin = 1;
 static const int kRightMargin = 1;
 
@@ skipping 27 matching lines @@
 
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
 // Tag for the 'Other bookmarks' button.
 static const int kOtherFolderButtonTag = 1;
 
 // Tag for the 'Apps Shortcut' button.
 static const int kAppsShortcutButtonTag = 2;
 
+// Preferred padding between text and edge.
+//
+// Note that the vertical padding is one pixel less than it was in TextButton;
+// we clip the bottom of letters like 'g' or 'p' if we don't.
+static const int kButtonPaddingHorizontal = 6;
+static const int kButtonPaddingVertical = 4;
+
 namespace {
 
 // To enable/disable BookmarkBar animations during testing. In production
 // animations are enabled by default.
 bool animations_enabled = true;
 
 // BookmarkButtonBase -----------------------------------------------
 
 // Base class for text buttons used on the bookmark bar.
 
-class BookmarkButtonBase : public views::TextButton {
+class BookmarkButtonBase : public views::LabelButton {
  public:
   BookmarkButtonBase(views::ButtonListener* listener,
                      const base::string16& title)
-      : TextButton(listener, title) {
+      : LabelButton(listener, title) {
+    SetElideBehavior(gfx::FADE_TAIL);
     show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
       show_animation_->Reset(1);
     } else {
       show_animation_->Show();
     }
   }
 
   virtual bool IsTriggerableEvent(const ui::Event& e) OVERRIDE {
     return e.type() == ui::ET_GESTURE_TAP ||
            e.type() == ui::ET_GESTURE_TAP_DOWN ||
            event_utils::IsPossibleDispositionEvent(e);
   }
 
+  virtual scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const OVERRIDE {
+    // We change the insets on the border to match the previous TextButton.
+    scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder();
+    border->set_insets(gfx::Insets(kButtonPaddingVertical,
+                                   kButtonPaddingHorizontal,
+                                   kButtonPaddingVertical,
+                                   kButtonPaddingHorizontal));
+    return border.Pass();
+  }
+
  private:
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButtonBase);
 };
 
 // BookmarkButton -------------------------------------------------------------
 
 // Buttons used for the bookmarks on the bookmark bar.
 
 class BookmarkButton : public BookmarkButtonBase {
  public:
   // The internal view class name.
   static const char kViewClassName[];
 
   BookmarkButton(views::ButtonListener* listener,
                  const GURL& url,
                  const base::string16& title,
                  Profile* profile)
       : BookmarkButtonBase(listener, title),
         url_(url),
         profile_(profile) {
   }
 
   virtual bool GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const OVERRIDE {
     gfx::Point location(p);
     ConvertPointToScreen(this, &location);
     *tooltip = BookmarkBarView::CreateToolTipForURLAndTitle(
-        GetWidget(), location, url_, text(), profile_);
+        GetWidget(), location, url_, GetText(), profile_);
     return !tooltip->empty();
   }
 
   virtual const char* GetClassName() const OVERRIDE {
     return kViewClassName;
   }
 
  private:
   const GURL& url_;
   Profile* profile_;
@@ skipping 46 matching lines @@
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
       show_animation_->Reset(1);
     } else {
       show_animation_->Show();
     }
   }
 
   virtual bool GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const OVERRIDE {
-    if (text_size_.width() > GetTextBounds().width())
-      *tooltip = text_;
+    if (label()->GetPreferredSize().width() > label()->size().width())
+      *tooltip = GetText();
     return !tooltip->empty();
   }
 
   virtual bool IsTriggerableEvent(const ui::Event& e) OVERRIDE {
     // Left clicks and taps should show the menu contents and right clicks
     // should show the context menu. They should not trigger the opening of
     // underlying urls.
     if (e.type() == ui::ET_GESTURE_TAP ||
         (e.IsMouseEvent() && (e.flags() &
              (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON))))
       return false;
 
     if (e.IsMouseEvent())
       return ui::DispositionFromEventFlags(e.flags()) != CURRENT_TAB;
     return false;
   }
 
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    views::MenuButton::PaintButton(canvas, views::MenuButton::PB_NORMAL);
-  }
-
  private:
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
 // OverFlowButton (chevron) --------------------------------------------------
 
 class OverFlowButton : public views::MenuButton {
  public:
@@ skipping 112 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView);
 };
 
 // BookmarkBarView ------------------------------------------------------------
 
 // static
 const int BookmarkBarView::kMaxButtonWidth = 150;
 const int BookmarkBarView::kNewtabHorizontalPadding = 2;
 const int BookmarkBarView::kToolbarAttachedBookmarkBarOverlap = 3;
 
-static const gfx::ImageSkia& GetDefaultFavicon() {
+const gfx::ImageSkia& GetDefaultFavicon() {
   if (!kDefaultFavicon) {
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     kDefaultFavicon = rb->GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
   }
   return *kDefaultFavicon;
 }
 
-static const gfx::ImageSkia& GetFolderIcon() {
+const gfx::ImageSkia& GetFolderIcon() {
   if (!kFolderIcon) {
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     kFolderIcon = rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER);
   }
   return *kFolderIcon;
 }
 
 BookmarkBarView::BookmarkBarView(Browser* browser, BrowserView* browser_view)
     : page_navigator_(NULL),
       model_(NULL),
@@ skipping 646 matching lines @@
   Layout();
   SchedulePaint();
 }
 
 void BookmarkBarView::BookmarkNodeFaviconChanged(BookmarkModel* model,
                                                  const BookmarkNode* node) {
   BookmarkNodeChangedImpl(model, node);
 }
 
 void BookmarkBarView::WriteDragDataForView(View* sender,
                                            const gfx::Point& press_pt,

[sky, 2014/06/09 15:42:00]

I think you're missing the offset (press_pt) used here.

[Elliot Glaysher, 2014/06/11 00:27:28]

Added optional offset parameter to SetURLAndDragImage and threaded press_pt
through.

                                            ui::OSExchangeData* data) {
   content::RecordAction(UserMetricsAction("BookmarkBar_DragButton"));
 
   for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
     if (sender == GetBookmarkButton(i)) {
-      views::TextButton* button = GetBookmarkButton(i);
-      scoped_ptr<gfx::Canvas> canvas(
-          views::GetCanvasForDragImage(button->GetWidget(), button->size()));
-      button->PaintButton(canvas.get(), views::TextButton::PB_FOR_DRAG);
-      drag_utils::SetDragImageOnDataObject(*canvas, button->size(),
-                                           press_pt.OffsetFromOrigin(),
-                                           data);
+      views::LabelButton* button = GetBookmarkButton(i);
+      const BookmarkNode* node = model_->bookmark_bar_node()->GetChild(i);
+
+      const gfx::ImageSkia& icon = *model_->GetFavicon(node).ToImageSkia();
+      button_drag_utils::SetURLAndDragImage(
+          node->url(),
+          node->GetTitle(),
+          icon,
+          data,
+          button->GetWidget());
       WriteBookmarkDragData(model_->bookmark_bar_node()->GetChild(i), data);
       return;
     }
   }
   NOTREACHED();
 }
 
 int BookmarkBarView::GetDragOperationsForView(View* sender,
                                               const gfx::Point& p) {
   if (size_animation_->is_animating() ||
@@ skipping 191 matching lines @@
     // done loading, then we'll populate the bar.
   }
 }
 
 int BookmarkBarView::GetBookmarkButtonCount() const {
   // We contain four non-bookmark button views: other bookmarks, bookmarks
   // separator, chevrons (for overflow), apps page, and the instruction label.
   return child_count() - 5;
 }
 
-views::TextButton* BookmarkBarView::GetBookmarkButton(int index) {
+views::LabelButton* BookmarkBarView::GetBookmarkButton(int index) {
   DCHECK(index >= 0 && index < GetBookmarkButtonCount());
-  return static_cast<views::TextButton*>(child_at(index));
+  return static_cast<views::LabelButton*>(child_at(index));
 }
 
 BookmarkLaunchLocation BookmarkBarView::GetBookmarkLaunchLocation() const {
   return IsDetached() ? BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR :
                         BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR;
 }
 
 int BookmarkBarView::GetFirstHiddenNodeIndex() {
   const int bb_count = GetBookmarkButtonCount();
   for (int i = 0; i < bb_count; ++i) {
     if (!GetBookmarkButton(i)->visible())
       return i;
   }
   return bb_count;
 }
 
 MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
   // Title is set in Loaded.
   MenuButton* button =
       new BookmarkFolderButton(this, base::string16(), this, false);
   button->set_id(VIEW_ID_OTHER_BOOKMARKS);
-  button->SetIcon(GetFolderIcon());
+  button->SetImage(views::Button::STATE_NORMAL, GetFolderIcon());
   button->set_context_menu_controller(this);
   button->set_tag(kOtherFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   MenuButton* button = new OverFlowButton(this);
-  button->SetIcon(*rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_CHEVRONS));
+  button->SetImage(views::Button::STATE_NORMAL,
+                   *rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
   // right-to-left.
   //
   // By default, menu buttons are not flipped because they generally contain
   // text and flipping the gfx::Canvas object will break text rendering. Since
   // the overflow button does not contain text, we can safely flip it.
   button->EnableCanvasFlippingForRTLUI(true);
 
   // Make visible as necessary.
   button->SetVisible(false);
   // Set accessibility name.
   button->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS_CHEVRON));
   return button;
 }
 
 views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) {
   if (node->is_url()) {
     BookmarkButton* button = new BookmarkButton(
         this, node->url(), node->GetTitle(), browser_->profile());
     ConfigureButton(node, button);
     return button;
   } else {
     views::MenuButton* button = new BookmarkFolderButton(
         this, node->GetTitle(), this, false);
-    button->SetIcon(GetFolderIcon());
+    button->SetImage(views::Button::STATE_NORMAL, GetFolderIcon());
     ConfigureButton(node, button);
     return button;
   }
 }
 
-views::TextButton* BookmarkBarView::CreateAppsPageShortcutButton() {
-  views::TextButton* button = new ShortcutButton(
+views::LabelButton* BookmarkBarView::CreateAppsPageShortcutButton() {
+  views::LabelButton* button = new ShortcutButton(
       this, l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME));
   button->SetTooltipText(l10n_util::GetStringUTF16(
       IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP));
   button->set_id(VIEW_ID_BOOKMARK_BAR_ELEMENT);
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-  button->SetIcon(*rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_APPS_SHORTCUT));
+  button->SetImage(views::Button::STATE_NORMAL,
+                   *rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_APPS_SHORTCUT));
   button->set_context_menu_controller(this);
   button->set_tag(kAppsShortcutButtonTag);
   return button;
 }
 
 void BookmarkBarView::ConfigureButton(const BookmarkNode* node,
-                                      views::TextButton* button) {
+                                      views::LabelButton* button) {
   button->SetText(node->GetTitle());
   button->SetAccessibleName(node->GetTitle());
   button->set_id(VIEW_ID_BOOKMARK_BAR_ELEMENT);
   // We don't always have a theme provider (ui tests, for example).
   if (GetThemeProvider()) {
-    button->SetEnabledColor(GetThemeProvider()->GetColor(
-        ThemeProperties::COLOR_BOOKMARK_TEXT));
+    button->SetTextColor(
+        views::Button::STATE_NORMAL,
+        GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
   }
 
-  button->ClearMaxTextSize();

[msw, 2014/06/09 17:18:40]

ditto: call set_min_size(gfx::Size())

   button->set_context_menu_controller(this);
   button->set_drag_controller(this);
   if (node->is_url()) {
     const gfx::Image& favicon = model_->GetFavicon(node);
     if (!favicon.IsEmpty())
-      button->SetIcon(*favicon.ToImageSkia());
+      button->SetImage(views::Button::STATE_NORMAL, *favicon.ToImageSkia());
     else
-      button->SetIcon(GetDefaultFavicon());
+      button->SetImage(views::Button::STATE_NORMAL, GetDefaultFavicon());
   }
-  button->set_max_width(kMaxButtonWidth);
+  button->set_max_size(gfx::Size(kMaxButtonWidth, 0));
 }
 
 void BookmarkBarView::BookmarkNodeAddedImpl(BookmarkModel* model,
                                             const BookmarkNode* parent,
                                             int index) {
   UpdateOtherBookmarksVisibility();
   if (parent != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
@@ skipping 31 matching lines @@
 }
 
 void BookmarkBarView::BookmarkNodeChangedImpl(BookmarkModel* model,
                                               const BookmarkNode* node) {
   if (node->parent() != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
   int index = model_->bookmark_bar_node()->GetIndexOf(node);
   DCHECK_NE(-1, index);
-  views::TextButton* button = GetBookmarkButton(index);
+  views::LabelButton* button = GetBookmarkButton(index);
   gfx::Size old_pref = button->GetPreferredSize();
   ConfigureButton(node, button);
   gfx::Size new_pref = button->GetPreferredSize();
   if (old_pref.width() != new_pref.width()) {
     Layout();
     SchedulePaint();
   } else if (button->visible()) {
     button->SchedulePaint();
   }
 }
@@ skipping 73 matching lines @@
     int ops = data.GetFirstNode(model_, profile->GetPath()) ?
         ui::DragDropTypes::DRAG_MOVE :
         ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK;
     location->operation = chrome::GetPreferredBookmarkDropOperation(
         event.source_operations(), ops);
     return;
   }
 
   for (int i = 0; i < GetBookmarkButtonCount() &&
        GetBookmarkButton(i)->visible() && !found; i++) {
-    views::TextButton* button = GetBookmarkButton(i);
+    views::LabelButton* button = GetBookmarkButton(i);
     int button_x = mirrored_x - button->x();
     int button_w = button->width();
     if (button_x < button_w) {
       found = true;
       const BookmarkNode* node = model_->bookmark_bar_node()->GetChild(i);
       if (node->is_folder()) {
         if (button_x <= views::kDropBetweenPixels) {
           location->index = i;
         } else if (button_x < button_w - views::kDropBetweenPixels) {
           location->index = i;
@@ skipping 116 matching lines @@
   return other_bookmarked_button_;
 }
 
 void BookmarkBarView::UpdateColors() {
   // We don't always have a theme provider (ui tests, for example).
   const ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (!theme_provider)
     return;
   SkColor text_color =
       theme_provider->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT);
-  for (int i = 0; i < GetBookmarkButtonCount(); ++i)
-    GetBookmarkButton(i)->SetEnabledColor(text_color);
-  other_bookmarked_button()->SetEnabledColor(text_color);
+  for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
+    GetBookmarkButton(i)->SetTextColor(views::Button::STATE_NORMAL,
+                                       text_color);
+  }
+  other_bookmarked_button()->SetTextColor(views::Button::STATE_NORMAL,
+                                          text_color);
   if (apps_page_shortcut_->visible())
-    apps_page_shortcut_->SetEnabledColor(text_color);
+    apps_page_shortcut_->SetTextColor(views::Button::STATE_NORMAL, text_color);
 }
 
 void BookmarkBarView::UpdateOtherBookmarksVisibility() {
   bool has_other_children = !model_->other_node()->empty();
   if (has_other_children == other_bookmarked_button_->visible())
     return;
   other_bookmarked_button_->SetVisible(has_other_children);
   UpdateBookmarksSeparatorVisibility();
   Layout();
   SchedulePaint();
@@ skipping 111 matching lines @@
   DCHECK(apps_page_shortcut_);
   // Only perform layout if required.
   bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar(
       browser_->profile(), browser_->host_desktop_type());
   if (apps_page_shortcut_->visible() == visible)
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   Layout();
 }