Chromium Code Reviews| Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
| index 7ef849da816108486dbfd6055e6ea641af9e2fd1..9765e3329c71b1eaffc861683246cb5b568176c3 100644 |
| --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
| +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
| @@ -229,6 +229,12 @@ scoped_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() const { |
| return border.Pass(); |
| } |
| +bool ToolbarActionView::ShouldEnterPushedState(const ui::Event& event) { |
| + return view_controller_->HasPopup(GetCurrentWebContents()) ? |
| + MenuButton::ShouldEnterPushedState(event) : |
| + LabelButton::ShouldEnterPushedState(event); |
|
Finnur
2015/02/20 10:36:10
style-nit: Maybe I'm getting tainted by writing mo
Devlin
2015/02/20 22:56:20
According to the conclusion in https://groups.goog
|
| +} |
| + |
| gfx::ImageSkia ToolbarActionView::GetIconForTest() { |
| return GetImage(views::Button::STATE_NORMAL); |
| } |