Fix accelerator handling for in-menu buttons in the app menu.

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 "base/macros.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
@@ skipping 38 matching lines @@
   }
 
   bool pressed() { return pressed_; }
   bool canceled() { return canceled_; }
 
   void Reset() {
     pressed_ = false;
     canceled_ = 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 pressed_ = false;
   bool canceled_ = 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);
-};
-
 // An InkDropDelegate that keeps track of ink drop visibility.
 class TestInkDropDelegate : public InkDropDelegate {
  public:
   TestInkDropDelegate(InkDropHost* ink_drop_host,
                       bool* ink_shown,
                       bool* ink_hidden)
       : ink_drop_host_(ink_drop_host),
         ink_shown_(ink_shown),
         ink_hidden_(ink_hidden) {
     ink_drop_host_->AddInkDropLayer(nullptr);
@@ skipping 56 matching lines @@
 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 TestWidget);
+    widget_.reset(new Widget);
     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();
 
     button_ = new TestCustomButton();
     widget_->SetContentsView(button_);
   }
 
   void TearDown() override {
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
   void CreateButtonWithInkDrop() {
     delete button_;
     ink_shown_ = false;
     ink_hidden_ = false;
     button_ = new TestButtonWithInkDrop(&ink_shown_, &ink_hidden_);
     widget_->SetContentsView(button_);
   }
 
  protected:
-  TestWidget* widget() { return widget_.get(); }
+  Widget* widget() { return widget_.get(); }
   TestCustomButton* button() { return button_; }
   bool ink_shown() const { return ink_shown_; }
   bool ink_hidden() const { return ink_hidden_; }
 
  private:
-  scoped_ptr<TestWidget> widget_;
+  scoped_ptr<Widget> widget_;
   TestCustomButton* button_;
   bool ink_shown_ = false;
   bool ink_hidden_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButtonTest);
 };
 
 }  // namespace
 
 // Tests that hover state changes correctly when visiblity/enableness changes.
@@ skipping 99 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()->pressed());
 }
 
-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()->pressed());
-  // 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()->pressed());
-  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()->pressed());
-  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()->pressed());
-}
-
 // Tests that OnClickCanceled gets called when NotifyClick is not expected
 // anymore.
 TEST_F(CustomButtonTest, NotifyActionNoClick) {
   gfx::Point center(10, 10);
 
   // By default the button should notify its listener on mouse release.
   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
       ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_RIGHT_MOUSE_BUTTON));
   EXPECT_FALSE(button()->canceled());
@@ skipping 112 matching lines @@
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown());
   EXPECT_FALSE(ink_hidden());
 
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
   EXPECT_TRUE(ink_hidden());
 }
 
 }  // namespace views