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" |
11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
12 #include "ash/wm/workspace_controller.h" | 12 #include "ash/wm/workspace_controller.h" |
13 #include "ash/wm/workspace_controller_test_helper.h" | 13 #include "ash/wm/workspace_controller_test_helper.h" |
14 #include "ui/aura/client/aura_constants.h" | 14 #include "ui/aura/client/aura_constants.h" |
| 15 #include "ui/aura/client/window_move_client.h" |
15 #include "ui/aura/root_window.h" | 16 #include "ui/aura/root_window.h" |
16 #include "ui/aura/test/event_generator.h" | 17 #include "ui/aura/test/event_generator.h" |
17 #include "ui/aura/test/test_window_delegate.h" | 18 #include "ui/aura/test/test_window_delegate.h" |
18 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
19 #include "ui/base/hit_test.h" | 20 #include "ui/base/hit_test.h" |
20 #include "ui/gfx/screen.h" | 21 #include "ui/gfx/screen.h" |
21 | 22 |
22 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
23 #include "base/win/windows_version.h" | 24 #include "base/win/windows_version.h" |
24 #endif | 25 #endif |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 generator.MoveMouseTo(generator.current_location() + gfx::Vector2d(50, 50)); | 332 generator.MoveMouseTo(generator.current_location() + gfx::Vector2d(50, 50)); |
332 } | 333 } |
333 | 334 |
334 // Verifies deleting the window while in a run loop doesn't crash. | 335 // Verifies deleting the window while in a run loop doesn't crash. |
335 TEST_F(WorkspaceEventHandlerTest, DeleteWhileInRunLoop) { | 336 TEST_F(WorkspaceEventHandlerTest, DeleteWhileInRunLoop) { |
336 aura::test::TestWindowDelegate wd; | 337 aura::test::TestWindowDelegate wd; |
337 const gfx::Rect bounds(10, 20, 30, 40); | 338 const gfx::Rect bounds(10, 20, 30, 40); |
338 scoped_ptr<aura::Window> window(CreateTestWindow(&wd, bounds)); | 339 scoped_ptr<aura::Window> window(CreateTestWindow(&wd, bounds)); |
339 wd.set_window_component(HTCAPTION); | 340 wd.set_window_component(HTCAPTION); |
340 | 341 |
341 ASSERT_TRUE(aura::client::GetWindowMoveClient(window->parent())); | 342 ASSERT_TRUE(aura::client::GetWindowMoveClient(window->GetRootWindow())); |
342 base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get()); | 343 base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get()); |
343 aura::client::GetWindowMoveClient(window->parent()) | 344 aura::client::GetWindowMoveClient(window->GetRootWindow()) |
344 ->RunMoveLoop(window.release(), | 345 ->RunMoveLoop(window.release(), |
345 gfx::Vector2d(), | 346 gfx::Vector2d(), |
346 aura::client::WINDOW_MOVE_SOURCE_MOUSE); | 347 aura::client::WINDOW_MOVE_SOURCE_MOUSE); |
347 } | 348 } |
348 | 349 |
349 } // namespace internal | 350 } // namespace internal |
350 } // namespace ash | 351 } // namespace ash |
OLD | NEW |