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

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

Issue 2370913002: Removes AshTestBase::SupportsHostWindowResize (Closed)
Patch Set: feedback Created 4 years, 2 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 TestScreenshotDelegate* test_screenshot_delegate() { 65 TestScreenshotDelegate* test_screenshot_delegate() {
66 return test_screenshot_delegate_; 66 return test_screenshot_delegate_;
67 } 67 }
68 68
69 AshTestEnvironment* ash_test_environment() { return ash_test_environment_; } 69 AshTestEnvironment* ash_test_environment() { return ash_test_environment_; }
70 70
71 // True if the running environment supports multiple displays, 71 // True if the running environment supports multiple displays,
72 // or false otherwise (e.g. win8 bot). 72 // or false otherwise (e.g. win8 bot).
73 static bool SupportsMultipleDisplays(); 73 static bool SupportsMultipleDisplays();
74 74
75 // True if the running environment supports host window resize,
76 // or false otherwise (e.g. win8 bot).
77 static bool SupportsHostWindowResize();
78
79 private: 75 private:
80 AshTestEnvironment* ash_test_environment_; // Not owned. 76 AshTestEnvironment* ash_test_environment_; // Not owned.
81 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. 77 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell.
82 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 78 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
83 79
84 // Owned by ash::AcceleratorController 80 // Owned by ash::AcceleratorController
85 TestScreenshotDelegate* test_screenshot_delegate_; 81 TestScreenshotDelegate* test_screenshot_delegate_;
86 82
87 std::unique_ptr<views::ViewsDelegate> views_delegate_; 83 std::unique_ptr<views::ViewsDelegate> views_delegate_;
88 84
89 #if defined(OS_CHROMEOS) 85 #if defined(OS_CHROMEOS)
90 // Check if DBus Thread Manager was initialized here. 86 // Check if DBus Thread Manager was initialized here.
91 bool dbus_thread_manager_initialized_; 87 bool dbus_thread_manager_initialized_;
92 // Check if Bluez DBus Manager was initialized here. 88 // Check if Bluez DBus Manager was initialized here.
93 bool bluez_dbus_manager_initialized_; 89 bool bluez_dbus_manager_initialized_;
94 #endif 90 #endif
95 91
96 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_; 92 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
97 93
98 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); 94 DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
99 }; 95 };
100 96
101 } // namespace test 97 } // namespace test
102 } // namespace ash 98 } // namespace ash
103 99
104 #endif // ASH_TEST_ASH_TEST_HELPER_H_ 100 #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