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

ui/views/view_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 <stddef.h>
 
 #include <map>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
@@ skipping 194 matching lines @@
 
 // A derived class for testing purpose.
 class TestView : public View {
  public:
   TestView()
       : View(),
         did_layout_(false),
         delete_on_pressed_(false),
         did_paint_(false),
         native_theme_(NULL),
-        can_process_events_within_subtree_(true) {}
+        can_process_events_within_subtree_(true),
+        is_child_widget_(false),
+        focus_in_child_widget_(false) {}
   ~TestView() override {}
 
   // Reset all test state
   void Reset() {
     did_change_bounds_ = false;
     did_layout_ = false;
     last_mouse_event_type_ = 0;
     location_.SetPoint(0, 0);
     received_mouse_enter_ = false;
     received_mouse_exit_ = false;
@@ skipping 32 matching lines @@
   void OnMouseReleased(const ui::MouseEvent& event) override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
 
   void OnPaint(gfx::Canvas* canvas) override;
   void SchedulePaintInRect(const gfx::Rect& rect) override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 
   void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
 
+  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; }
+
   // OnBoundsChanged.
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
 
   // Layout.
   bool did_layout_;
 
   // MouseEvent.
   int last_mouse_event_type_;
   gfx::Point location_;
   bool received_mouse_enter_;
   bool received_mouse_exit_;
   bool delete_on_pressed_;
 
   // Painting.
   std::vector<gfx::Rect> scheduled_paint_rects_;
   bool did_paint_;
 
   // Accelerators.
   std::map<ui::Accelerator, int> accelerator_count_map_;
 
   // Native theme.
   const ui::NativeTheme* native_theme_;
 
   // Value to return from CanProcessEventsWithinSubtree().
   bool can_process_events_within_subtree_;
+
+  bool is_child_widget_;
+  bool focus_in_child_widget_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Layout
 ////////////////////////////////////////////////////////////////////////////////
 
 TEST_F(ViewTest, LayoutCalledInvalidateAndOriginChanges) {
   TestView parent;
   TestView* child = new TestView;
   gfx::Rect parent_rect(0, 0, 100, 100);
@@ skipping 1790 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accelerators
 ////////////////////////////////////////////////////////////////////////////////
 bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   accelerator_count_map_[accelerator]++;
   return true;
 }
 
+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);
+};
+
+// ChromeOS handles accelerators correctly with regards to the activeness or top
+// level status of the widget, so there's no extra logic there to test.
+#if !defined(OS_CHROMEOS)
+TEST_F(ViewTest, HandleAccelerator) {
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
+  TestView* view = new TestView();
+  view->Reset();
+  view->AddAccelerator(return_accelerator);
+  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
+
+  // Create a window and add the view as its child.
+  scoped_ptr<TestWidget> widget(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, 100, 100);
+  widget->Init(params);
+  View* root = widget->GetRootView();
+  root->AddChildView(view);
+  widget->Show();
+
+  FocusManager* focus_manager = widget->GetFocusManager();
+  ASSERT_TRUE(focus_manager);
+
+  // Child widgets shouldn't handle accelerators when they are not focused.
+  EXPECT_FALSE(view->IsChildWidget());
+  EXPECT_FALSE(view->FocusInChildWidget());
+  EXPECT_FALSE(widget->IsActive());
+  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(0, view->accelerator_count_map_[return_accelerator]);
+
+  // Child without focus.
+  view->set_child_widget(true);
+  view->set_focus_in_child_widget(false);
+  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(0, view->accelerator_count_map_[return_accelerator]);
+
+  // Child with focus.
+  view->set_child_widget(true);
+  view->set_focus_in_child_widget(true);
+  EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(1, view->accelerator_count_map_[return_accelerator]);
+
+  // Not a child, but active.
+  view->set_child_widget(false);
+  view->set_focus_in_child_widget(true);
+  widget->set_active(true);
+  EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(2, view->accelerator_count_map_[return_accelerator]);
+}
+#endif
+
 // TODO: these tests were initially commented out when getting aura to
 // run. Figure out if still valuable and either nuke or fix.
 #if 0
 TEST_F(ViewTest, ActivateAccelerator) {
   // Register a keyboard accelerator before the view is added to a window.
   ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
@@ skipping 2283 matching lines @@
 
   // The View should continue receiving events after the |handler| is deleted.
   v->Reset();
   ui::MouseEvent released(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
                           ui::EventTimeForNow(), 0, 0);
   root->OnMouseReleased(released);
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, v->last_mouse_event_type_);
 }
 
 }  // namespace views