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

Side by Side Diff: ash/test/ash_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 | « no previous file | ash/test/ash_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 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 ASH_TEST_ASH_TEST_HELPER_H_ 5 #ifndef ASH_TEST_ASH_TEST_HELPER_H_
6 #define ASH_TEST_ASH_TEST_HELPER_H_ 6 #define ASH_TEST_ASH_TEST_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
11 #include "ash/common/test/material_design_controller_test_api.h" 11 #include "ash/common/test/material_design_controller_test_api.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 14
15 namespace aura { 15 namespace aura {
16 class Window; 16 class Window;
17 } // namespace aura 17 } // namespace aura
18 18
19 namespace ui { 19 namespace ui {
20 class ScopedAnimationDurationScaleMode; 20 class ScopedAnimationDurationScaleMode;
21 } // namespace ui 21 } // namespace ui
22 22
23 namespace views { 23 namespace views {
24 class ViewsDelegate; 24 class ViewsDelegate;
25 } 25 }
26 26
27 namespace wm {
28 class WMState;
29 }
30
27 namespace ash { 31 namespace ash {
28 namespace test { 32 namespace test {
29 33
30 class AshTestEnvironment; 34 class AshTestEnvironment;
31 class TestScreenshotDelegate; 35 class TestScreenshotDelegate;
32 class TestShellDelegate; 36 class TestShellDelegate;
33 class TestSessionStateDelegate; 37 class TestSessionStateDelegate;
34 38
35 // A helper class that does common initialization required for Ash. Creates a 39 // A helper class that does common initialization required for Ash. Creates a
36 // root window and an ash::Shell instance with a test delegate. 40 // root window and an ash::Shell instance with a test delegate.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 static bool SupportsMultipleDisplays(); 77 static bool SupportsMultipleDisplays();
74 78
75 private: 79 private:
76 AshTestEnvironment* ash_test_environment_; // Not owned. 80 AshTestEnvironment* ash_test_environment_; // Not owned.
77 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. 81 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell.
78 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 82 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
79 83
80 // Owned by ash::AcceleratorController 84 // Owned by ash::AcceleratorController
81 TestScreenshotDelegate* test_screenshot_delegate_; 85 TestScreenshotDelegate* test_screenshot_delegate_;
82 86
87 std::unique_ptr<::wm::WMState> wm_state_;
83 std::unique_ptr<views::ViewsDelegate> views_delegate_; 88 std::unique_ptr<views::ViewsDelegate> views_delegate_;
84 89
85 #if defined(OS_CHROMEOS) 90 #if defined(OS_CHROMEOS)
86 // Check if DBus Thread Manager was initialized here. 91 // Check if DBus Thread Manager was initialized here.
87 bool dbus_thread_manager_initialized_; 92 bool dbus_thread_manager_initialized_;
88 // Check if Bluez DBus Manager was initialized here. 93 // Check if Bluez DBus Manager was initialized here.
89 bool bluez_dbus_manager_initialized_; 94 bool bluez_dbus_manager_initialized_;
90 #endif 95 #endif
91 96
92 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_; 97 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
93 98
94 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); 99 DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
95 }; 100 };
96 101
97 } // namespace test 102 } // namespace test
98 } // namespace ash 103 } // namespace ash
99 104
100 #endif // ASH_TEST_ASH_TEST_HELPER_H_ 105 #endif // ASH_TEST_ASH_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698