Chromium Code Reviews| Index: ui/views/widget/native_widget_aura_unittest.cc |
| diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc |
| index f10981f2327ac6e5cde3356afa9f1be69752c36c..c6964914869828eb9baf5aaf66087119408a202d 100644 |
| --- a/ui/views/widget/native_widget_aura_unittest.cc |
| +++ b/ui/views/widget/native_widget_aura_unittest.cc |
| @@ -19,9 +19,12 @@ |
| #include "ui/events/event_utils.h" |
| #include "ui/gfx/screen.h" |
| #include "ui/views/layout/fill_layout.h" |
| +#include "ui/views/test/widget_test.h" |
| #include "ui/views/widget/root_view.h" |
| #include "ui/views/widget/widget_delegate.h" |
| +#include "ui/wm/core/base_focus_rules.h" |
| #include "ui/wm/core/default_activation_client.h" |
| +#include "ui/wm/core/focus_controller.h" |
| namespace views { |
| namespace { |
| @@ -34,19 +37,48 @@ NativeWidgetAura* Init(aura::Window* parent, Widget* widget) { |
| return static_cast<NativeWidgetAura*>(widget->native_widget()); |
| } |
| +class TestFocusRules : public wm::BaseFocusRules { |
|
sky
2016/03/03 20:22:47
Add description.
xdai1
2016/03/03 22:01:31
Done.
|
| + public: |
| + TestFocusRules() {} |
| + ~TestFocusRules() override {} |
| + |
| + void SetActivatable(bool can_activate) { can_activate_ = can_activate; } |
|
sky
2016/03/03 20:22:47
set_can_activate
xdai1
2016/03/03 22:01:31
Done.
|
| + |
| + // wm::BaseFocusRules overrides: |
| + bool SupportsChildActivation(aura::Window* window) const override { |
| + return true; |
| + } |
| + |
| + bool CanActivateWindow(aura::Window* window) const override { |
| + return can_activate_; |
| + } |
| + |
| + private: |
| + bool can_activate_ = true; |
| + |
| + DISALLOW_COPY_AND_ASSIGN(TestFocusRules); |
| +}; |
| + |
| class NativeWidgetAuraTest : public aura::test::AuraTestBase { |
| public: |
| NativeWidgetAuraTest() {} |
| ~NativeWidgetAuraTest() override {} |
| + TestFocusRules* test_focus_rules() { return test_focus_rules_; } |
| + |
| // testing::Test overrides: |
| void SetUp() override { |
| AuraTestBase::SetUp(); |
| - new wm::DefaultActivationClient(root_window()); |
| + test_focus_rules_ = new TestFocusRules; |
| + focus_controller_.reset(new wm::FocusController(test_focus_rules_)); |
| + aura::client::SetActivationClient(root_window(), focus_controller_.get()); |
| host()->SetBounds(gfx::Rect(640, 480)); |
| } |
| private: |
| + scoped_ptr<wm::FocusController> focus_controller_; |
| + TestFocusRules* test_focus_rules_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(NativeWidgetAuraTest); |
| }; |
| @@ -485,5 +517,34 @@ TEST_F(NativeWidgetAuraTest, OnWidgetMovedInvokedAfterAcquireLayer) { |
| widget->CloseNow(); |
| } |
| +// Tests that if a widget has a view which should be initially focused when the |
| +// widget is shown, this view should not get focused if the associated window |
| +// can not be activated. |
| +TEST_F(NativeWidgetAuraTest, PreventFocusOnNonActivableWindow) { |
| + test_focus_rules()->SetActivatable(false); |
| + scoped_ptr<views::Widget> w1(new views::Widget); |
| + views::test::TestInitialFocusWidgetDelegate* delegate = |
| + new views::test::TestInitialFocusWidgetDelegate(root_window()); |
| + views::Widget::InitParams params1; |
| + params1.delegate = delegate; |
| + params1.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| + params1.context = root_window(); |
| + w1->Init(params1); |
| + w1->Show(); |
| + EXPECT_FALSE(delegate->view()->HasFocus()); |
| + |
| + test_focus_rules()->SetActivatable(true); |
| + scoped_ptr<views::Widget> w2(new views::Widget); |
| + views::test::TestInitialFocusWidgetDelegate* delegate2 = |
| + new views::test::TestInitialFocusWidgetDelegate(root_window()); |
| + views::Widget::InitParams params2; |
| + params2.delegate = delegate2; |
| + params2.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| + params2.context = root_window(); |
| + w2->Init(params2); |
| + w2->Show(); |
| + EXPECT_TRUE(delegate2->view()->HasFocus()); |
| +} |
| + |
| } // namespace |
| } // namespace views |