MenuButton: support Mac look & feel

ui/views/style/platform_style.cc

 // Copyright 2015 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/style/platform_style.h"
 
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 38 matching lines @@
 std::unique_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
   return base::WrapUnique(new FocusableBorder());
 }
 
 // static
 std::unique_ptr<Background> PlatformStyle::CreateComboboxBackground() {
   return nullptr;
 }
 
 // static
+std::unique_ptr<Background> PlatformStyle::CreateMenuButtonBackground() {
+  return nullptr;
+}
+
+// static
+std::unique_ptr<FocusableBorder> PlatformStyle::CreateMenuButtonBorder() {
+  return base::WrapUnique(new FocusableBorder());
+}
+
+// static
 std::unique_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
     Button::ButtonStyle style) {
   if (!ui::MaterialDesignController::IsModeMaterial() ||
       style != Button::STYLE_TEXTBUTTON) {
     return base::WrapUnique(new LabelButtonAssetBorder(style));
   }
 
   std::unique_ptr<LabelButtonBorder> border(new views::LabelButtonBorder());
   border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
       Button::STYLE_TEXTBUTTON));
   return border;
 }
 
 // static
+gfx::ImageSkia PlatformStyle::CreateMenuButtonArrow(bool is_enabled) {
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
+}
+
+// static
 std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
   return base::WrapUnique(new NativeScrollBar(is_horizontal));
 }
 
 // static
 SkColor PlatformStyle::TextColorForButton(
     const ButtonColorByState& color_by_state,
     const LabelButton& button) {
   return color_by_state[button.state()];
 }
 
 #endif  // OS_MACOSX
 
+// This definition is used even on Mac, but Mac has its own
+// CreateComboboxArrow() so it will return something different on Mac.
+// static
+int PlatformStyle::GetComboboxShoulderWidth(Combobox::Style style) {
+  const int kNormalPadding = 7;
+  const int kActionPadding = 11;
+  int padding =
+      style == Combobox::STYLE_NORMAL ? kNormalPadding * 2 : kActionPadding * 2;
+  int image_width = CreateComboboxArrow(true, style).size().width();

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

I don't think the .size() is needed, same below. But, I also think we should
hard-code this, and perhaps DCHECK against the width(), since this gets called
quite a bit, and a resource bundle lookup has some cost (as does copying the
ImageSkia - it's ref-counted, but thread safe so there's special instructions
and impact to the cpu cache and stuff).

but of course that would need different widths based on the platform. (maybe
it's better to keep the ImageSkia on the Combobox instance and initialize it in
the constructor)

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

Okay.

The reason why it wasn't statically computed right now is because SetStyle() can
get called on the combobox later on. I'm refactoring Combobox so that the style
is passed into the constructor and is const, and then I can cache the arrow
image and width inside the combobox. I made the style const and cached the image
inside Combobox/MenuButton, then kicked the Get*ShoulderWidth() methods back
into the classes themselves, so the only thing PlatformStyle exports is the
Get*ArrowImage() methods, which are called only once in the constructors. This
also makes the code easier to follow, so win/win.

+  return padding + image_width;
+}
+
+// static
+int PlatformStyle::GetMenuButtonShoulderWidth() {
+  const int kPadding = 7;
+  return kPadding * 2 + CreateMenuButtonArrow(true).size().width();
+}
+
 #if !defined(DESKTOP_LINUX) && !defined(OS_MACOSX)
 // static
 void PlatformStyle::ApplyLabelButtonTextStyle(
     Label* label,
     ButtonColorByState* color_by_state) {
   ButtonColorByState& colors = *color_by_state;
   colors[Button::STATE_NORMAL] = kStyleButtonTextColor;
   colors[Button::STATE_HOVERED] = kStyleButtonTextColor;
   colors[Button::STATE_PRESSED] = kStyleButtonTextColor;
 
   const ui::NativeTheme* theme = label->GetNativeTheme();
   label->SetBackgroundColor(
       theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonBackgroundColor));
   label->SetAutoColorReadabilityEnabled(false);
   label->SetShadows(gfx::ShadowValues(
       1, gfx::ShadowValue(gfx::Vector2d(0, 1), 0, kStyleButtonShadowColor)));
 }
 #endif
 
 #if !defined(DESKTOP_LINUX)
 // static
 std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
     LabelButton* button) {
   return button->CreateDefaultBorder();
 }
 #endif
 
 }  // namespace views