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 <memory> | 8 #include <memory> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "ui/aura/client/window_tree_client.h" | 12 #include "ui/aura/client/window_tree_client.h" |
13 #include "ui/aura/window_tree_host.h" | 13 #include "ui/aura/window_tree_host.h" |
14 | 14 |
15 namespace aura { | 15 namespace aura { |
| 16 class InputMethodGlue; |
16 class Window; | 17 class Window; |
17 class WindowTreeHost; | 18 class WindowTreeHost; |
18 namespace client { | 19 namespace client { |
19 class DefaultCaptureClient; | 20 class DefaultCaptureClient; |
20 class FocusClient; | 21 class FocusClient; |
21 } | 22 } |
22 } | 23 } |
23 | 24 |
24 namespace gfx { | 25 namespace gfx { |
25 class Rect; | 26 class Rect; |
(...skipping 19 matching lines...) Expand all Loading... |
45 | 46 |
46 aura::WindowTreeHost* host() { return host_.get(); } | 47 aura::WindowTreeHost* host() { return host_.get(); } |
47 | 48 |
48 // Overridden from client::WindowTreeClient: | 49 // Overridden from client::WindowTreeClient: |
49 aura::Window* GetDefaultParent(aura::Window* context, | 50 aura::Window* GetDefaultParent(aura::Window* context, |
50 aura::Window* window, | 51 aura::Window* window, |
51 const gfx::Rect& bounds) override; | 52 const gfx::Rect& bounds) override; |
52 | 53 |
53 private: | 54 private: |
54 std::unique_ptr<aura::WindowTreeHost> host_; | 55 std::unique_ptr<aura::WindowTreeHost> host_; |
55 | 56 std::unique_ptr<aura::InputMethodGlue> input_method_glue_; |
56 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 57 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
57 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; | 58 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
58 std::unique_ptr<aura::client::FocusClient> focus_client_; | 59 std::unique_ptr<aura::client::FocusClient> focus_client_; |
59 | 60 |
60 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); | 61 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); |
61 }; | 62 }; |
62 | 63 |
63 } // namespace wm | 64 } // namespace wm |
64 | 65 |
65 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ | 66 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ |
OLD | NEW |