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