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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 .GetActiveRotation(); | 214 .GetActiveRotation(); |
215 } | 215 } |
216 | 216 |
217 // static | 217 // static |
218 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { | 218 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { |
219 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); | 219 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); |
220 } | 220 } |
221 | 221 |
222 // static | 222 // static |
223 void AshTestBase::UpdateDisplay(const std::string& display_specs) { | 223 void AshTestBase::UpdateDisplay(const std::string& display_specs) { |
224 if (Shell::GetAshConfig() == Config::MASH) { | 224 if (!Shell::ShouldEnableSimplifiedDisplayManagement()) { |
225 ash_test_helper_->UpdateDisplayForMash(display_specs); | 225 ash_test_helper_->UpdateDisplayForMash(display_specs); |
226 } else { | 226 } else { |
227 display::test::DisplayManagerTestApi(Shell::Get()->display_manager()) | 227 display::test::DisplayManagerTestApi(Shell::Get()->display_manager()) |
228 .UpdateDisplay(display_specs); | 228 .UpdateDisplay(display_specs); |
229 } | 229 } |
230 } | 230 } |
231 | 231 |
232 aura::Window* AshTestBase::CurrentContext() { | 232 aura::Window* AshTestBase::CurrentContext() { |
233 return ash_test_helper_->CurrentContext(); | 233 return ash_test_helper_->CurrentContext(); |
234 } | 234 } |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 return display::Screen::GetScreen()->GetDisplayNearestWindow( | 482 return display::Screen::GetScreen()->GetDisplayNearestWindow( |
483 Shell::GetPrimaryRootWindow()); | 483 Shell::GetPrimaryRootWindow()); |
484 } | 484 } |
485 | 485 |
486 display::Display AshTestBase::GetSecondaryDisplay() { | 486 display::Display AshTestBase::GetSecondaryDisplay() { |
487 return ash_test_helper_->GetSecondaryDisplay(); | 487 return ash_test_helper_->GetSecondaryDisplay(); |
488 } | 488 } |
489 | 489 |
490 } // namespace test | 490 } // namespace test |
491 } // namespace ash | 491 } // namespace ash |
OLD | NEW |