| 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 614fd5e9b0eef5ee7df3a91ffa91a177ad08cc2d..bddc7f2c656a17a6a1dbe801c380136b6744b660 100644
|
| --- a/ui/views/controls/button/menu_button.cc
|
| +++ b/ui/views/controls/button/menu_button.cc
|
| @@ -65,17 +65,22 @@ MenuButton::MenuButton(ButtonListener* listener,
|
| const base::string16& text,
|
| MenuButtonListener* menu_button_listener,
|
| bool show_menu_marker)
|
| - : LabelButton(listener, text),
|
| + : LabelButton(listener),
|
| 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),
|
| weak_factory_(this) {
|
| SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| +
|
| + // TODO(tapted): Remove this. MenuButton has subclasses and Init() may call
|
| + // virtual methods.
|
| + InitAsTextbutton(text);
|
| }
|
|
|
| MenuButton::~MenuButton() {
|
|
|