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

Side by Side Diff: ash/test/ash_test_base.cc

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.h ('k') | ash/test/ash_test_helper.h » ('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 #include "ash/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/test/test_session_state_delegate.h" 10 #include "ash/common/test/test_session_state_delegate.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 ->GetDisplayInfo(id) 191 ->GetDisplayInfo(id)
192 .GetActiveRotation(); 192 .GetActiveRotation();
193 } 193 }
194 194
195 // static 195 // static
196 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { 196 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() {
197 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); 197 return GetActiveDisplayRotation(display::Display::InternalDisplayId());
198 } 198 }
199 199
200 // static 200 // static
201 bool AshTestBase::SupportsMultipleDisplays() {
202 return AshTestHelper::SupportsMultipleDisplays();
203 }
204
205 // static
206 void AshTestBase::UpdateDisplay(const std::string& display_specs) { 201 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
207 display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager()) 202 display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
208 .UpdateDisplay(display_specs); 203 .UpdateDisplay(display_specs);
209 } 204 }
210 205
211 aura::Window* AshTestBase::CurrentContext() { 206 aura::Window* AshTestBase::CurrentContext() {
212 return ash_test_helper_->CurrentContext(); 207 return ash_test_helper_->CurrentContext();
213 } 208 }
214 209
215 // static 210 // static
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 386
392 void AshTestBase::SwapPrimaryDisplay() { 387 void AshTestBase::SwapPrimaryDisplay() {
393 if (display::Screen::GetScreen()->GetNumDisplays() <= 1) 388 if (display::Screen::GetScreen()->GetNumDisplays() <= 1)
394 return; 389 return;
395 Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId( 390 Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
396 display_manager()->GetSecondaryDisplay().id()); 391 display_manager()->GetSecondaryDisplay().id());
397 } 392 }
398 393
399 } // namespace test 394 } // namespace test
400 } // namespace ash 395 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.h ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698