OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <algorithm> | 5 #include <algorithm> |
6 | 6 |
7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/drag_drop/drag_drop_controller.h" | 8 #include "ash/drag_drop/drag_drop_controller.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #include "ui/views/widget/widget_delegate.h" | 49 #include "ui/views/widget/widget_delegate.h" |
50 #include "ui/wm/core/window_util.h" | 50 #include "ui/wm/core/window_util.h" |
51 #include "ui/wm/public/activation_delegate.h" | 51 #include "ui/wm/public/activation_delegate.h" |
52 | 52 |
53 namespace ash { | 53 namespace ash { |
54 namespace { | 54 namespace { |
55 | 55 |
56 class NonActivatableActivationDelegate | 56 class NonActivatableActivationDelegate |
57 : public aura::client::ActivationDelegate { | 57 : public aura::client::ActivationDelegate { |
58 public: | 58 public: |
59 virtual bool ShouldActivate() const override { | 59 bool ShouldActivate() const override { return false; } |
60 return false; | |
61 } | |
62 }; | 60 }; |
63 | 61 |
64 void CancelDrag(DragDropController* controller, bool* canceled) { | 62 void CancelDrag(DragDropController* controller, bool* canceled) { |
65 if (controller->IsDragDropInProgress()) { | 63 if (controller->IsDragDropInProgress()) { |
66 *canceled = true; | 64 *canceled = true; |
67 controller->DragCancel(); | 65 controller->DragCancel(); |
68 } | 66 } |
69 } | 67 } |
70 | 68 |
71 } // namespace | 69 } // namespace |
72 | 70 |
73 class WindowSelectorTest : public test::AshTestBase { | 71 class WindowSelectorTest : public test::AshTestBase { |
74 public: | 72 public: |
75 WindowSelectorTest() {} | 73 WindowSelectorTest() {} |
76 virtual ~WindowSelectorTest() {} | 74 ~WindowSelectorTest() override {} |
77 | 75 |
78 virtual void SetUp() override { | 76 void SetUp() override { |
79 test::AshTestBase::SetUp(); | 77 test::AshTestBase::SetUp(); |
80 ASSERT_TRUE(test::TestShelfDelegate::instance()); | 78 ASSERT_TRUE(test::TestShelfDelegate::instance()); |
81 | 79 |
82 shelf_view_test_.reset(new test::ShelfViewTestAPI( | 80 shelf_view_test_.reset(new test::ShelfViewTestAPI( |
83 test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view())); | 81 test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view())); |
84 shelf_view_test_->SetAnimationDuration(1); | 82 shelf_view_test_->SetAnimationDuration(1); |
85 } | 83 } |
86 | 84 |
87 aura::Window* CreateWindow(const gfx::Rect& bounds) { | 85 aura::Window* CreateWindow(const gfx::Rect& bounds) { |
88 return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds); | 86 return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds); |
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1263 // Switch to overview mode. | 1261 // Switch to overview mode. |
1264 ToggleOverview(); | 1262 ToggleOverview(); |
1265 ASSERT_TRUE(IsSelecting()); | 1263 ASSERT_TRUE(IsSelecting()); |
1266 | 1264 |
1267 // Tap should now exit overview mode. | 1265 // Tap should now exit overview mode. |
1268 generator.GestureTapAt(point_in_background_page); | 1266 generator.GestureTapAt(point_in_background_page); |
1269 EXPECT_FALSE(IsSelecting()); | 1267 EXPECT_FALSE(IsSelecting()); |
1270 } | 1268 } |
1271 | 1269 |
1272 } // namespace ash | 1270 } // namespace ash |
OLD | NEW |