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

Side by Side Diff: ash/test/ash_test_helper.h

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 years, 11 months 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 | « ash/test/ash_test_base.cc ('k') | 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"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void set_test_shell_delegate(TestShellDelegate* test_shell_delegate) { 63 void set_test_shell_delegate(TestShellDelegate* test_shell_delegate) {
64 test_shell_delegate_ = test_shell_delegate; 64 test_shell_delegate_ = test_shell_delegate;
65 } 65 }
66 TestScreenshotDelegate* test_screenshot_delegate() { 66 TestScreenshotDelegate* test_screenshot_delegate() {
67 return test_screenshot_delegate_; 67 return test_screenshot_delegate_;
68 } 68 }
69 AshTestViewsDelegate* views_delegate() { return views_delegate_.get(); } 69 AshTestViewsDelegate* views_delegate() { return views_delegate_.get(); }
70 70
71 AshTestEnvironment* ash_test_environment() { return ash_test_environment_; } 71 AshTestEnvironment* ash_test_environment() { return ash_test_environment_; }
72 72
73 // True if the running environment supports multiple displays,
74 // or false otherwise (e.g. win8 bot).
75 static bool SupportsMultipleDisplays();
76
77 private: 73 private:
78 AshTestEnvironment* ash_test_environment_; // Not owned. 74 AshTestEnvironment* ash_test_environment_; // Not owned.
79 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. 75 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell.
80 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 76 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
81 77
82 // Owned by ash::AcceleratorController 78 // Owned by ash::AcceleratorController
83 TestScreenshotDelegate* test_screenshot_delegate_; 79 TestScreenshotDelegate* test_screenshot_delegate_;
84 80
85 std::unique_ptr<::wm::WMState> wm_state_; 81 std::unique_ptr<::wm::WMState> wm_state_;
86 std::unique_ptr<AshTestViewsDelegate> views_delegate_; 82 std::unique_ptr<AshTestViewsDelegate> views_delegate_;
87 83
88 // Check if DBus Thread Manager was initialized here. 84 // Check if DBus Thread Manager was initialized here.
89 bool dbus_thread_manager_initialized_; 85 bool dbus_thread_manager_initialized_;
90 // Check if Bluez DBus Manager was initialized here. 86 // Check if Bluez DBus Manager was initialized here.
91 bool bluez_dbus_manager_initialized_; 87 bool bluez_dbus_manager_initialized_;
92 88
93 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_; 89 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
94 90
95 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); 91 DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
96 }; 92 };
97 93
98 } // namespace test 94 } // namespace test
99 } // namespace ash 95 } // namespace ash
100 96
101 #endif // ASH_TEST_ASH_TEST_HELPER_H_ 97 #endif // ASH_TEST_ASH_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698