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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 .GetActiveRotation(); | 194 .GetActiveRotation(); |
195 } | 195 } |
196 | 196 |
197 // static | 197 // static |
198 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { | 198 display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { |
199 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); | 199 return GetActiveDisplayRotation(display::Display::InternalDisplayId()); |
200 } | 200 } |
201 | 201 |
202 // static | 202 // static |
203 void AshTestBase::UpdateDisplay(const std::string& display_specs) { | 203 void AshTestBase::UpdateDisplay(const std::string& display_specs) { |
204 if (Shell::GetAshConfig() != Config::CLASSIC) { | 204 if (Shell::GetAshConfig() == Config::MASH) { |
205 ash_test_helper_->UpdateDisplayForMash(display_specs); | 205 ash_test_helper_->UpdateDisplayForMash(display_specs); |
206 } else { | 206 } else { |
207 display::test::DisplayManagerTestApi(Shell::Get()->display_manager()) | 207 display::test::DisplayManagerTestApi(Shell::Get()->display_manager()) |
208 .UpdateDisplay(display_specs); | 208 .UpdateDisplay(display_specs); |
209 } | 209 } |
210 } | 210 } |
211 | 211 |
212 aura::Window* AshTestBase::CurrentContext() { | 212 aura::Window* AshTestBase::CurrentContext() { |
213 return ash_test_helper_->CurrentContext(); | 213 return ash_test_helper_->CurrentContext(); |
214 } | 214 } |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( | 423 Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( |
424 display_manager()->GetSecondaryDisplay().id()); | 424 display_manager()->GetSecondaryDisplay().id()); |
425 } | 425 } |
426 | 426 |
427 display::Display AshTestBase::GetSecondaryDisplay() { | 427 display::Display AshTestBase::GetSecondaryDisplay() { |
428 return ash_test_helper_->GetSecondaryDisplay(); | 428 return ash_test_helper_->GetSecondaryDisplay(); |
429 } | 429 } |
430 | 430 |
431 } // namespace test | 431 } // namespace test |
432 } // namespace ash | 432 } // namespace ash |
OLD | NEW |