Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

Issue 935163002: [Extensions Toolbar Views] Override ShouldEnterPushedState in ToolbarActionView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698