MenuButton: support Mac look & feel

ui/views/controls/button/menu_button.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 "ui/views/controls/button/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
+#include "ui/views/controls/focusable_border.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/style/platform_style.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using base::TimeTicks;
 using base::TimeDelta;
 
 namespace views {
 
 // Default menu offset.
 static const int kDefaultMenuOffsetX = -2;
@@ skipping 30 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 MenuButton::MenuButton(const base::string16& text,
                        MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
     : LabelButton(nullptr, text),
       menu_offset_(kDefaultMenuOffsetX, kDefaultMenuOffsetY),
       listener_(menu_button_listener),
       show_menu_marker_(show_menu_marker),
-      menu_marker_(ui::ResourceBundle::GetSharedInstance()
-                       .GetImageNamed(IDR_MENU_DROPARROW)
-                       .ToImageSkia()),
       destroyed_flag_(nullptr),
       pressed_lock_count_(0),
       increment_pressed_lock_called_(nullptr),
       should_disable_after_press_(false),
       weak_factory_(this) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  SetBorder(PlatformStyle::CreateMenuButtonBorder());

[tapted, 2016/04/22 13:46:52]

won't this still affect the OIB in a way that we don't want it to? I think we
want those to be borderless regardless of platform

[Elly Fong-Jones, 2016/04/25 14:30:50]

What is an OIB?

[tapted, 2016/04/26 05:05:57]

OIB is origin info bubble :). Which is the "official" name for the site settings
dialog AKA "that dialog you get when you click the padlock icon in the location
bar".

I put a screenshot at http://crbug.com/605161#c4 from an earlier patchset. And
it looks that way still in patchset 4 with mac_views_browser=1 or mvb=0. The
problem is that PermissionMenuButton (in permission_selector_view.cc) has a
weird initialization path. I think to fix this we need views::MenuButton to
override LabelButton::UpdateThemedBorder() [and/or OnNativeThemeChanged] and
these method calls need to move into that method.  [OnNativeThemeChanged gets
called when the button is added to a Widget, so we shouldn't have to call
UpdateThemedBorder explicitly in MenuButton's initialization paths]. Then, so
long as PermissionMenuButton calls `SetBorder(<something> -- probably nullptr)`
in its constructor [probably after its call to UpdateThemedBorder()] things
might be "ok". But see http://crbug.com/510747 where I caused a regression here
on GTK - things are a bit fragile, so we need to check each platform :/

Note there's also a faint white border/outline around the bookmarks bar's "Other
Bookmarks" menu button (mac_views_browser=1 only).

+  if (show_menu_marker_)
+    set_background(PlatformStyle::CreateMenuButtonBackground().release());
 }
 
 MenuButton::~MenuButton() {
   if (destroyed_flag_)
     *destroyed_flag_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Public APIs
@@ skipping 96 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Events
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Size MenuButton::GetPreferredSize() const {
   gfx::Size prefsize = LabelButton::GetPreferredSize();
-  if (show_menu_marker_) {
-    prefsize.Enlarge(menu_marker_->width() + kMenuMarkerPaddingLeft +
-                         kMenuMarkerPaddingRight,
-                     0);
-  }
+  if (show_menu_marker_)
+    prefsize.Enlarge(PlatformStyle::GetMenuButtonShoulderWidth(), 0);
   return prefsize;
 }
 
 const char* MenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 bool MenuButton::OnMousePressed(const ui::MouseEvent& event) {
   if (request_focus_on_press())
     RequestFocus();
@@ skipping 93 matching lines @@
   state->role = ui::AX_ROLE_POP_UP_BUTTON;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
 void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   // Using the Views mirroring infrastructure incorrectly flips icon content.
   // Instead, manually mirror the position of the down arrow.
-  gfx::Rect arrow_bounds(width() - insets.right() -
-                         menu_marker_->width() - kMenuMarkerPaddingRight,
-                         height() / 2 - menu_marker_->height() / 2,
-                         menu_marker_->width(),
-                         menu_marker_->height());
+  gfx::Rect arrow_bounds(
+      width() - insets.right() - PlatformStyle::GetMenuButtonShoulderWidth(), 0,
+      PlatformStyle::GetMenuButtonShoulderWidth(), height());
+  gfx::ImageSkia marker = PlatformStyle::CreateMenuButtonArrow(enabled());
+  arrow_bounds.ClampToCenteredSize(marker.size());
   arrow_bounds.set_x(GetMirroredXForRect(arrow_bounds));
-  canvas->DrawImageInt(*menu_marker_, arrow_bounds.x(), arrow_bounds.y());
+  canvas->DrawImageInt(marker, arrow_bounds.x(), arrow_bounds.y());
 }
 
 gfx::Rect MenuButton::GetChildAreaBounds() {
   gfx::Size s = size();
 
-  if (show_menu_marker_) {
-    s.set_width(s.width() - menu_marker_->width() - kMenuMarkerPaddingLeft -
-                kMenuMarkerPaddingRight);
-  }
+  if (show_menu_marker_)
+    s.set_width(s.width() - PlatformStyle::GetMenuButtonShoulderWidth());
 
   return gfx::Rect(s);
 }
 
 bool MenuButton::IsTriggerableEvent(const ui::Event& event) {
   if (!IsTriggerableEventType(event))
     return false;
 
   TimeDelta delta = TimeTicks::Now() - menu_closed_time_;
   if (delta.InMilliseconds() < kMinimumMsBetweenButtonClicks)
@@ skipping 64 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views