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

Side by Side Diff: ash/test/ash_test_base.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
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 ASH_TEST_ASH_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_
6 #define ASH_TEST_ASH_TEST_BASE_H_ 6 #define ASH_TEST_ASH_TEST_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 BLOCKED_BY_USER_ADDING_SCREEN, 131 BLOCKED_BY_USER_ADDING_SCREEN,
132 NUMBER_OF_BLOCK_REASONS 132 NUMBER_OF_BLOCK_REASONS
133 }; 133 };
134 134
135 // Returns the rotation currentl active for the display |id|. 135 // Returns the rotation currentl active for the display |id|.
136 static display::Display::Rotation GetActiveDisplayRotation(int64_t id); 136 static display::Display::Rotation GetActiveDisplayRotation(int64_t id);
137 137
138 // Returns the rotation currently active for the internal display. 138 // Returns the rotation currently active for the internal display.
139 static display::Display::Rotation GetCurrentInternalDisplayRotation(); 139 static display::Display::Rotation GetCurrentInternalDisplayRotation();
140 140
141 // Proxy to AshTestHelper::SupportsMultipleDisplays().
142 static bool SupportsMultipleDisplays();
143
144 void set_start_session(bool start_session) { start_session_ = start_session; } 141 void set_start_session(bool start_session) { start_session_ = start_session; }
145 142
146 // Sets material mode for the test. This will override material mode set via 143 // Sets material mode for the test. This will override material mode set via
147 // command line switches. 144 // command line switches.
148 void set_material_mode(MaterialDesignController::Mode material_mode) { 145 void set_material_mode(MaterialDesignController::Mode material_mode) {
149 CHECK(!setup_called_); 146 CHECK(!setup_called_);
150 material_mode_ = material_mode; 147 material_mode_ = material_mode;
151 } 148 }
152 149
153 AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); } 150 AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 ~NoSessionAshTestBase() override {} 197 ~NoSessionAshTestBase() override {}
201 198
202 private: 199 private:
203 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 200 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
204 }; 201 };
205 202
206 } // namespace test 203 } // namespace test
207 } // namespace ash 204 } // namespace ash
208 205
209 #endif // ASH_TEST_ASH_TEST_BASE_H_ 206 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698