Custom buttons should only handle accelerators when focused.

ui/views/controls/button/custom_button_unittest.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/custom_button.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
@@ skipping 25 matching lines @@
   ~TestCustomButton() override {}
 
   void ButtonPressed(Button* sender, const ui::Event& event) override {
     notified_ = true;
   }
 
   bool notified() { return notified_; }
 
   void Reset() { notified_ = false; }
 
+  // CustomButton methods:
+  bool IsChildWidget() const override { return is_child_widget_; }
+  bool FocusInChildWidget() const override { return focus_in_child_widget_; }
+
+  void set_child_widget(bool b) { is_child_widget_ = b; }
+  void set_focus_in_child_widget(bool b) { focus_in_child_widget_ = b; }
+
  private:
   bool notified_ = false;
+  bool is_child_widget_ = false;
+  bool focus_in_child_widget_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestCustomButton);
 };
 
+class TestWidget : public Widget {
+ public:
+  TestWidget() : Widget() {}
+
+  // Widget method:
+  bool IsActive() const override { return active_; }
+
+  void set_active(bool active) { active_ = active; }
+
+ private:
+  bool active_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWidget);
+};
+
 class CustomButtonTest : public ViewsTestBase {
  public:
   CustomButtonTest() {}
   ~CustomButtonTest() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
 
     // Create a widget so that the CustomButton can query the hover state
     // correctly.
-    widget_.reset(new Widget);
+    widget_.reset(new TestWidget);
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 0, 650, 650);
     widget_->Init(params);
     widget_->Show();
 
     // Position the widget in a way so that it is under the cursor.
     gfx::Point cursor = gfx::Screen::GetScreenFor(
         widget_->GetNativeView())->GetCursorScreenPoint();
     gfx::Rect widget_bounds = widget_->GetWindowBoundsInScreen();
     widget_bounds.set_origin(cursor);
     widget_->SetBounds(widget_bounds);
 
     button_ = new TestCustomButton();
     widget_->SetContentsView(button_);
   }
 
   void TearDown() override {
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
-  Widget* widget() { return widget_.get(); }
+  TestWidget* widget() { return widget_.get(); }
   TestCustomButton* button() { return button_; }
 
  private:
-  scoped_ptr<Widget> widget_;
+  scoped_ptr<TestWidget> widget_;
   TestCustomButton* button_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButtonTest);
 };
 
 }  // namespace
 
 // Tests that hover state changes correctly when visiblity/enableness changes.
 TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
   gfx::Point center(10, 10);
@@ skipping 97 matching lines @@
 
   // The button should no longer notify on mouse release.
   button()->Reset();
   button()->OnMouseReleased(ui::MouseEvent(
       ui::ET_MOUSE_RELEASED, center, center, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
   EXPECT_EQ(CustomButton::STATE_HOVERED, button()->state());
   EXPECT_FALSE(button()->notified());
 }
 
+TEST_F(CustomButtonTest, HandleAccelerator) {
+  // Child widgets shouldn't handle accelerators when they are not focused.
+  EXPECT_FALSE(button()->IsChildWidget());
+  EXPECT_FALSE(button()->FocusInChildWidget());
+  EXPECT_FALSE(widget()->IsActive());
+  button()->AcceleratorPressed(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
+  EXPECT_FALSE(button()->notified());
+  // Child without focus.
+  button()->set_child_widget(true);
+  button()->set_focus_in_child_widget(false);
+  button()->AcceleratorPressed(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
+  EXPECT_FALSE(button()->notified());
+  button()->Reset();
+  // Child with focus.
+  button()->set_child_widget(true);
+  button()->set_focus_in_child_widget(true);
+  button()->AcceleratorPressed(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
+  EXPECT_TRUE(button()->notified());
+  button()->Reset();
+  // Not a child, but active.
+  button()->set_child_widget(false);
+  button()->set_focus_in_child_widget(true);
+  widget()->set_active(true);
+  button()->AcceleratorPressed(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
+  EXPECT_TRUE(button()->notified());
+}
+
 // No touch on desktop Mac. Tracked in http://crbug.com/445520.
 #if !defined(OS_MACOSX) || defined(USE_AURA)
 
 namespace {
 
 void PerformGesture(CustomButton* button, ui::EventType event_type) {
   ui::GestureEventDetails gesture_details(event_type);
   base::TimeDelta time_stamp = base::TimeDelta::FromMicroseconds(0);
   ui::GestureEvent gesture_event(0, 0, 0, time_stamp, gesture_details);
   button->OnGestureEvent(&gesture_event);
@@ skipping 43 matching lines @@
   EXPECT_FALSE(CustomButton::AsCustomButton(&label));
 
   Link link(text);
   EXPECT_FALSE(CustomButton::AsCustomButton(&link));
 
   Textfield textfield;
   EXPECT_FALSE(CustomButton::AsCustomButton(&textfield));
 }
 
 }  // namespace views