OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/wm/workspace/multi_window_resize_controller.h" | 5 #include "ash/wm/workspace/multi_window_resize_controller.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "ash/wm/workspace_controller.h" | 10 #include "ash/wm/workspace_controller.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 public: | 25 public: |
26 MultiWindowResizeControllerTest() : resize_controller_(NULL) {} | 26 MultiWindowResizeControllerTest() : resize_controller_(NULL) {} |
27 virtual ~MultiWindowResizeControllerTest() {} | 27 virtual ~MultiWindowResizeControllerTest() {} |
28 | 28 |
29 virtual void SetUp() OVERRIDE { | 29 virtual void SetUp() OVERRIDE { |
30 test::AshTestBase::SetUp(); | 30 test::AshTestBase::SetUp(); |
31 WorkspaceController* wc = | 31 WorkspaceController* wc = |
32 ash::Shell::TestApi(Shell::GetInstance()).workspace_controller(); | 32 ash::Shell::TestApi(Shell::GetInstance()).workspace_controller(); |
33 wc->SetGridSize(0); | 33 wc->SetGridSize(0); |
34 WorkspaceEventFilter* event_filter = | 34 WorkspaceEventFilter* event_filter = |
35 WorkspaceControllerTestHelper(wc).filter(); | 35 WorkspaceControllerTestHelper(wc).GetFilter(); |
36 resize_controller_ = WorkspaceEventFilterTestHelper(event_filter). | 36 resize_controller_ = WorkspaceEventFilterTestHelper(event_filter). |
37 resize_controller(); | 37 resize_controller(); |
38 } | 38 } |
39 | 39 |
40 protected: | 40 protected: |
41 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate, | 41 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate, |
42 const gfx::Rect& bounds) { | 42 const gfx::Rect& bounds) { |
43 aura::Window* window = new aura::Window(delegate); | 43 aura::Window* window = new aura::Window(delegate); |
44 window->SetType(aura::client::WINDOW_TYPE_NORMAL); | 44 window->SetType(aura::client::WINDOW_TYPE_NORMAL); |
45 window->Init(ui::LAYER_TEXTURED); | 45 window->Init(ui::LAYER_TEXTURED); |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 EXPECT_TRUE(HasTarget(w3.get())); | 248 EXPECT_TRUE(HasTarget(w3.get())); |
249 | 249 |
250 // Release the mouse. The resizer should still be visible and a subsequent | 250 // Release the mouse. The resizer should still be visible and a subsequent |
251 // press should not trigger a DCHECK. | 251 // press should not trigger a DCHECK. |
252 generator.ReleaseLeftButton(); | 252 generator.ReleaseLeftButton(); |
253 EXPECT_TRUE(IsShowing()); | 253 EXPECT_TRUE(IsShowing()); |
254 generator.PressLeftButton(); | 254 generator.PressLeftButton(); |
255 } | 255 } |
256 } // namespace internal | 256 } // namespace internal |
257 } // namespace ash | 257 } // namespace ash |
OLD | NEW |