Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: ui/aura/test/aura_test_helper.h

Issue 2453953003: Moves TransientWindowClient to ui/aura/client and adds observer (Closed)
Patch Set: merge Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/aura/test/DEPS ('k') | ui/aura/test/aura_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_
6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_ 6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/aura/window_tree_host.h" 13 #include "ui/aura/window_tree_host.h"
14 14
15 namespace base { 15 namespace base {
16 class MessageLoopForUI; 16 class MessageLoopForUI;
17 } 17 }
18 18
19 namespace ui { 19 namespace ui {
20 class ContextFactory; 20 class ContextFactory;
21 class InputMethod; 21 class InputMethod;
22 class ScopedAnimationDurationScaleMode; 22 class ScopedAnimationDurationScaleMode;
23 } 23 }
24 24
25 namespace wm {
26 class WMState;
27 }
28
25 namespace aura { 29 namespace aura {
30 class Env;
26 class TestScreen; 31 class TestScreen;
27 class TestWindowTree; 32 class TestWindowTree;
28 class TestWindowTreeClientSetup; 33 class TestWindowTreeClientSetup;
29 class Window; 34 class Window;
30 class WindowPort; 35 class WindowPort;
31 class WindowManagerDelegate; 36 class WindowManagerDelegate;
32 class WindowTreeClient; 37 class WindowTreeClient;
33 class WindowTreeClientDelegate; 38 class WindowTreeClientDelegate;
34 39
35 namespace client { 40 namespace client {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 Env::WindowPortFactory InitMus(); 82 Env::WindowPortFactory InitMus();
78 83
79 std::unique_ptr<WindowPort> CreateWindowPortMus(Window* window); 84 std::unique_ptr<WindowPort> CreateWindowPortMus(Window* window);
80 85
81 base::MessageLoopForUI* message_loop_; 86 base::MessageLoopForUI* message_loop_;
82 bool use_mus_ = false; 87 bool use_mus_ = false;
83 bool setup_called_; 88 bool setup_called_;
84 bool teardown_called_; 89 bool teardown_called_;
85 std::unique_ptr<TestWindowTreeClientSetup> window_tree_client_setup_; 90 std::unique_ptr<TestWindowTreeClientSetup> window_tree_client_setup_;
86 std::unique_ptr<aura::Env> env_; 91 std::unique_ptr<aura::Env> env_;
92 std::unique_ptr<wm::WMState> wm_state_;
87 std::unique_ptr<WindowTreeHost> host_; 93 std::unique_ptr<WindowTreeHost> host_;
88 std::unique_ptr<TestWindowParentingClient> parenting_client_; 94 std::unique_ptr<TestWindowParentingClient> parenting_client_;
89 std::unique_ptr<client::DefaultCaptureClient> capture_client_; 95 std::unique_ptr<client::DefaultCaptureClient> capture_client_;
90 std::unique_ptr<client::FocusClient> focus_client_; 96 std::unique_ptr<client::FocusClient> focus_client_;
91 std::unique_ptr<TestScreen> test_screen_; 97 std::unique_ptr<TestScreen> test_screen_;
92 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 98 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
93 WindowTreeClientDelegate* window_tree_delegate_ = nullptr; 99 WindowTreeClientDelegate* window_tree_delegate_ = nullptr;
94 WindowManagerDelegate* window_manager_delegate_ = nullptr; 100 WindowManagerDelegate* window_manager_delegate_ = nullptr;
95 101
96 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); 102 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
97 }; 103 };
98 104
99 } // namespace test 105 } // namespace test
100 } // namespace aura 106 } // namespace aura
101 107
102 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ 108 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/aura/test/DEPS ('k') | ui/aura/test/aura_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698