MacViews: Fix ViewTest.HandleAccelerator by faking window activation

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 2088 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   accelerator_count_map_[accelerator]++;
   return true;
 }
 
 // On non-ChromeOS aura there is extra logic to determine whether a view should
 // handle accelerators or not (see View::CanHandleAccelerators for details).
 // This test targets that extra logic, but should also work on other platforms.
 TEST_F(ViewTest, HandleAccelerator) {
+  EnableMacFakeWindowActivation();
   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<Widget> widget(new Widget);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.ownership = 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);
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   // When a non-child view is not active, it shouldn't handle accelerators.
   EXPECT_FALSE(widget->IsActive());
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(0, view->accelerator_count_map_[return_accelerator]);
 #endif
 
+  // TYPE_POPUP widgets default to non-activatable, so the Show() above wouldn't
+  // have activated the Widget. First, allow activation.
+  widget->widget_delegate()->set_can_activate(true);

[tapted, 2016/03/10 10:52:42]

There's nothing in NativeWidgetAura::Activate that checks Widget::CanActivate
(just NativeWidgetAura::ShowWithWindowState()). And I think the
DefaultActivationClient that tests use don't apply the FocusRules the way the
"real" wm::FocusController ActivationClient does, which would otherwise also
prevent activation. So, I think that's why this test works with regular Aura
widgets without this line.

+
   // When a non-child view is active, it should handle accelerators.
   view->accelerator_count_map_[return_accelerator] = 0;
   widget->Activate();
   EXPECT_TRUE(widget->IsActive());
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(1, view->accelerator_count_map_[return_accelerator]);
 
   // Add a child view associated with a child widget.
   TestView* child_view = new TestView();
   child_view->Reset();
@@ skipping 2415 matching lines @@
   widget.Init(params);
 
   AddViewWithChildLayer(widget.GetRootView());
   ViewThatAddsViewInOnNativeThemeChanged* v =
       new ViewThatAddsViewInOnNativeThemeChanged;
   widget.GetRootView()->AddChildView(v);
   EXPECT_TRUE(v->on_native_theme_changed_called());
 }
 
 }  // namespace views