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 #ifndef UI_WM_TEST_WM_TEST_HELPER_H_ | 5 #ifndef UI_WM_TEST_WM_TEST_HELPER_H_ |
6 #define UI_WM_TEST_WM_TEST_HELPER_H_ | 6 #define UI_WM_TEST_WM_TEST_HELPER_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "ui/aura/client/window_tree_client.h" | 10 #include "ui/aura/client/window_tree_client.h" |
11 #include "ui/aura/window_tree_host.h" | 11 #include "ui/aura/window_tree_host.h" |
12 | 12 |
13 namespace aura { | 13 namespace aura { |
14 class Window; | 14 class Window; |
15 class WindowTreeHost; | 15 class WindowTreeHost; |
16 namespace client { | 16 namespace client { |
17 class DefaultCaptureClient; | 17 class DefaultCaptureClient; |
| 18 class DispatcherClient; |
18 class FocusClient; | 19 class FocusClient; |
| 20 class ScreenPositionClient; |
19 } | 21 } |
20 } | 22 } |
21 | 23 |
22 namespace gfx { | 24 namespace gfx { |
23 class Rect; | 25 class Rect; |
24 class Size; | 26 class Size; |
25 } | 27 } |
26 | 28 |
27 namespace ui { | 29 namespace ui { |
28 class ContextFactory; | 30 class ContextFactory; |
(...skipping 18 matching lines...) Expand all Loading... |
47 aura::Window* GetDefaultParent(aura::Window* context, | 49 aura::Window* GetDefaultParent(aura::Window* context, |
48 aura::Window* window, | 50 aura::Window* window, |
49 const gfx::Rect& bounds) override; | 51 const gfx::Rect& bounds) override; |
50 | 52 |
51 private: | 53 private: |
52 scoped_ptr<aura::WindowTreeHost> host_; | 54 scoped_ptr<aura::WindowTreeHost> host_; |
53 | 55 |
54 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 56 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
55 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 57 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
56 scoped_ptr<aura::client::FocusClient> focus_client_; | 58 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 59 scoped_ptr<aura::client::ScreenPositionClient> screen_position_client_; |
| 60 scoped_ptr<aura::client::DispatcherClient> dispatcher_client_; |
57 | 61 |
58 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); | 62 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); |
59 }; | 63 }; |
60 | 64 |
61 } // namespace wm | 65 } // namespace wm |
62 | 66 |
63 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ | 67 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ |
OLD | NEW |