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/workspace_event_handler.h" | 5 #include "ash/wm/workspace/workspace_event_handler.h" |
6 | 6 |
7 #include "ash/screen_ash.h" | 7 #include "ash/screen_ash.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 | 28 |
29 class WorkspaceEventHandlerTest : public test::AshTestBase { | 29 class WorkspaceEventHandlerTest : public test::AshTestBase { |
30 public: | 30 public: |
31 WorkspaceEventHandlerTest() {} | 31 WorkspaceEventHandlerTest() {} |
32 virtual ~WorkspaceEventHandlerTest() {} | 32 virtual ~WorkspaceEventHandlerTest() {} |
33 | 33 |
34 protected: | 34 protected: |
35 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate, | 35 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate, |
36 const gfx::Rect& bounds) { | 36 const gfx::Rect& bounds) { |
37 aura::Window* window = new aura::Window(delegate); | 37 aura::Window* window = new aura::Window(delegate); |
38 window->SetType(aura::client::WINDOW_TYPE_NORMAL); | 38 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); |
39 window->Init(ui::LAYER_TEXTURED); | 39 window->Init(ui::LAYER_TEXTURED); |
40 ParentWindowInPrimaryRootWindow(window); | 40 ParentWindowInPrimaryRootWindow(window); |
41 window->SetBounds(bounds); | 41 window->SetBounds(bounds); |
42 window->Show(); | 42 window->Show(); |
43 return window; | 43 return window; |
44 } | 44 } |
45 | 45 |
46 private: | 46 private: |
47 DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandlerTest); | 47 DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandlerTest); |
48 }; | 48 }; |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 ASSERT_TRUE(aura::client::GetWindowMoveClient(window->parent())); | 341 ASSERT_TRUE(aura::client::GetWindowMoveClient(window->parent())); |
342 base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get()); | 342 base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get()); |
343 aura::client::GetWindowMoveClient(window->parent()) | 343 aura::client::GetWindowMoveClient(window->parent()) |
344 ->RunMoveLoop(window.release(), | 344 ->RunMoveLoop(window.release(), |
345 gfx::Vector2d(), | 345 gfx::Vector2d(), |
346 aura::client::WINDOW_MOVE_SOURCE_MOUSE); | 346 aura::client::WINDOW_MOVE_SOURCE_MOUSE); |
347 } | 347 } |
348 | 348 |
349 } // namespace internal | 349 } // namespace internal |
350 } // namespace ash | 350 } // namespace ash |
OLD | NEW |