| Index: ui/views/controls/button/menu_button.cc
|
| diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
|
| index c7a53389a142840e66c7e50d712db0d25fb0ee2d..2764c7769598e7432b97d20f377c1925ae4345cc 100644
|
| --- a/ui/views/controls/button/menu_button.cc
|
| +++ b/ui/views/controls/button/menu_button.cc
|
| @@ -62,16 +62,16 @@ MenuButton::PressedLock::~PressedLock() {
|
| //
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| -MenuButton::MenuButton(ButtonListener* listener,
|
| - const base::string16& text,
|
| +MenuButton::MenuButton(const base::string16& text,
|
| MenuButtonListener* menu_button_listener,
|
| bool show_menu_marker)
|
| - : LabelButton(listener, text),
|
| + : 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()),
|
| + menu_marker_(ui::ResourceBundle::GetSharedInstance()
|
| + .GetImageNamed(IDR_MENU_DROPARROW)
|
| + .ToImageSkia()),
|
| destroyed_flag_(NULL),
|
| pressed_lock_count_(0),
|
| should_disable_after_press_(false),
|
|
|