OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ash/test/mirror_window_test_api.h" | 5 #include "ash/test/mirror_window_test_api.h" |
6 | 6 |
7 #include "ash/display/cursor_window_controller.h" | 7 #include "ash/display/cursor_window_controller.h" |
8 #include "ash/display/display_controller.h" | 8 #include "ash/display/display_controller.h" |
9 #include "ash/display/mirror_window_controller.h" | 9 #include "ash/display/mirror_window_controller.h" |
| 10 #include "ash/host/ash_window_tree_host.h" |
| 11 #include "ash/host/root_window_transformer.h" |
10 #include "ash/shell.h" | 12 #include "ash/shell.h" |
11 #include "ui/aura/root_window_transformer.h" | |
12 #include "ui/gfx/point.h" | 13 #include "ui/gfx/point.h" |
13 | 14 |
14 namespace ash { | 15 namespace ash { |
15 namespace test { | 16 namespace test { |
16 | 17 |
17 const aura::WindowTreeHost* MirrorWindowTestApi::GetHost() const { | 18 const aura::WindowTreeHost* MirrorWindowTestApi::GetHost() const { |
18 return Shell::GetInstance()->display_controller()-> | 19 return Shell::GetInstance()->display_controller()-> |
19 mirror_window_controller()->host_.get(); | 20 mirror_window_controller()->ash_host()->AsWindowTreeHost(); |
20 } | 21 } |
21 | 22 |
22 int MirrorWindowTestApi::GetCurrentCursorType() const { | 23 int MirrorWindowTestApi::GetCurrentCursorType() const { |
23 return Shell::GetInstance()->display_controller()-> | 24 return Shell::GetInstance()->display_controller()-> |
24 cursor_window_controller()->cursor_type_; | 25 cursor_window_controller()->cursor_type_; |
25 } | 26 } |
26 | 27 |
27 const gfx::Point& MirrorWindowTestApi::GetCursorHotPoint() const { | 28 const gfx::Point& MirrorWindowTestApi::GetCursorHotPoint() const { |
28 return Shell::GetInstance()->display_controller()-> | 29 return Shell::GetInstance()->display_controller()-> |
29 cursor_window_controller()->hot_point_; | 30 cursor_window_controller()->hot_point_; |
30 } | 31 } |
31 | 32 |
32 const aura::Window* MirrorWindowTestApi::GetCursorWindow() const { | 33 const aura::Window* MirrorWindowTestApi::GetCursorWindow() const { |
33 return Shell::GetInstance()->display_controller()-> | 34 return Shell::GetInstance()->display_controller()-> |
34 cursor_window_controller()->cursor_window_.get(); | 35 cursor_window_controller()->cursor_window_.get(); |
35 } | 36 } |
36 | 37 |
37 scoped_ptr<aura::RootWindowTransformer> | 38 scoped_ptr<RootWindowTransformer> |
38 MirrorWindowTestApi::CreateCurrentRootWindowTransformer() const { | 39 MirrorWindowTestApi::CreateCurrentRootWindowTransformer() const { |
39 return Shell::GetInstance()->display_controller()-> | 40 return Shell::GetInstance()->display_controller()-> |
40 mirror_window_controller()->CreateRootWindowTransformer(); | 41 mirror_window_controller()->CreateRootWindowTransformer(); |
41 } | 42 } |
42 | 43 |
43 } // namespace test | 44 } // namespace test |
44 } // namespace ash | 45 } // namespace ash |
OLD | NEW |