[Extensions Toolbar Views] Override ShouldEnterPushedState in ToolbarActionView

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 211 matching lines @@
     LabelButton::OnGestureEvent(event);
 }
 
 scoped_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() const {
   scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder();
   border->set_insets(gfx::Insets(kBorderInset, kBorderInset,
                                  kBorderInset, kBorderInset));
   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 mostly Java code at the moment,
but I thought we're now requesting these operators (? and :) to be at the front
of the line?

[Devlin, 2015/02/20 22:56:20]

According to the conclusion in
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/P5FkBWIeaHs
either way is acceptable. :)

+}
+
 gfx::ImageSkia ToolbarActionView::GetIconForTest() {
   return GetImage(views::Button::STATE_NORMAL);
 }
 
 views::View* ToolbarActionView::GetAsView() {
   return this;
 }
 
 bool ToolbarActionView::IsShownInMenu() {
   return delegate_->ShownInsideMenu();
@@ skipping 45 matching lines @@
     views::MenuButton* reference_view =
         static_cast<views::MenuButton*>(GetReferenceViewForPopup());
     pressed_lock_.reset(new views::MenuButton::PressedLock(reference_view));
   }
 }
 
 void ToolbarActionView::OnPopupClosed() {
   delegate_->SetPopupOwner(nullptr);
   pressed_lock_.reset();  // Unpress the menu button if it was pressed.
 }