MenuButton: support Mac look & feel

ui/views/controls/button/menu_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 36 matching lines @@
   static const int kMenuMarkerPaddingLeft;
   static const int kMenuMarkerPaddingRight;
 
   // Create a Button.
   MenuButton(const base::string16& text,
              MenuButtonListener* menu_button_listener,
              bool show_menu_marker);
   ~MenuButton() override;
 
   bool show_menu_marker() const { return show_menu_marker_; }
-  void set_menu_marker(const gfx::ImageSkia* menu_marker) {
-    menu_marker_ = menu_marker;
-  }
-  const gfx::ImageSkia* menu_marker() const { return menu_marker_; }
 
   const gfx::Point& menu_offset() const { return menu_offset_; }
   void set_menu_offset(int x, int y) { menu_offset_.SetPoint(x, y); }
 
   // Activate the button (called when the button is pressed). |event| is the
   // event triggering the activation, if any.
   bool Activate(const ui::Event* event);
 
   // Returns true if the event is of the proper type to potentially trigger an
   // action. Since MenuButtons have properties other than event type (like
@@ skipping 50 matching lines @@
   // is, if the menu is shown and the button is pressed, we need to close the
   // menu. There is no clean way to get the second click event because the
   // menu is displayed using a modal loop and, unlike regular menus in Windows,
   // the button is not part of the displayed menu.
   base::TimeTicks menu_closed_time_;
 
   // Our listener. Not owned.
   MenuButtonListener* listener_;
 
   // Whether or not we're showing a drop marker.
   bool show_menu_marker_;

[tapted, 2016/04/21 06:06:46]

can this be declared const? that might make it easier to reason about the rest
of the code

[Elly Fong-Jones, 2016/04/21 15:30:26]

Done.

 
-  // The down arrow used to differentiate the menu button from normal buttons.
-  const gfx::ImageSkia* menu_marker_;
-
   // If non-null the destructor sets this to true. This is set while the menu is
   // showing and used to detect if the menu was deleted while running.
   bool* destroyed_flag_;
 
   // The current number of "pressed" locks this button has.
   int pressed_lock_count_;
 
   // Used to let Activate() know if IncrementPressedLocked() was called.
   bool* increment_pressed_lock_called_;
 
   // True if the button was in a disabled state when a menu was run, and should
   // return to it once the press is complete. This can happen if, e.g., we
   // programmatically show a menu on a disabled button.
   bool should_disable_after_press_;
 
   base::WeakPtrFactory<MenuButton> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_