OLD | NEW |
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/display/extended_mouse_warp_controller.h" | 10 #include "ash/display/extended_mouse_warp_controller.h" |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 ->GetDisplayInfo(id) | 234 ->GetDisplayInfo(id) |
235 .GetActiveRotation(); | 235 .GetActiveRotation(); |
236 } | 236 } |
237 | 237 |
238 // static | 238 // static |
239 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { | 239 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { |
240 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); | 240 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); |
241 } | 241 } |
242 | 242 |
243 void AshTestBase::UpdateDisplay(const std::string& display_specs) { | 243 void AshTestBase::UpdateDisplay(const std::string& display_specs) { |
244 if (Shell::GetAshConfig() == Config::MASH) { | 244 if (!Shell::ShouldEnableSimplifiedDisplayManagement()) { |
245 ash_test_helper_->UpdateDisplayForMash(display_specs); | 245 ash_test_helper_->UpdateDisplayForMash(display_specs); |
246 } else { | 246 } else { |
247 display::test::DisplayManagerTestApi(Shell::Get()->display_manager()) | 247 display::test::DisplayManagerTestApi(Shell::Get()->display_manager()) |
248 .UpdateDisplay(display_specs); | 248 .UpdateDisplay(display_specs); |
249 } | 249 } |
250 UnblockCompositors(); | 250 UnblockCompositors(); |
251 } | 251 } |
252 | 252 |
253 aura::Window* AshTestBase::CurrentContext() { | 253 aura::Window* AshTestBase::CurrentContext() { |
254 return ash_test_helper_->CurrentContext(); | 254 return ash_test_helper_->CurrentContext(); |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 return display::Screen::GetScreen()->GetDisplayNearestWindow( | 503 return display::Screen::GetScreen()->GetDisplayNearestWindow( |
504 Shell::GetPrimaryRootWindow()); | 504 Shell::GetPrimaryRootWindow()); |
505 } | 505 } |
506 | 506 |
507 display::Display AshTestBase::GetSecondaryDisplay() { | 507 display::Display AshTestBase::GetSecondaryDisplay() { |
508 return ash_test_helper_->GetSecondaryDisplay(); | 508 return ash_test_helper_->GetSecondaryDisplay(); |
509 } | 509 } |
510 | 510 |
511 } // namespace test | 511 } // namespace test |
512 } // namespace ash | 512 } // namespace ash |
OLD | NEW |