| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/display/display_configuration_controller.h" | 5 #include "ash/display/display_configuration_controller.h" |
| 6 | 6 |
| 7 #include "ash/display/display_animator.h" | 7 #include "ash/display/display_animator.h" |
| 8 #include "ash/display/display_animator_chromeos.h" | 8 #include "ash/display/display_animator_chromeos.h" |
| 9 #include "ash/display/display_util.h" | 9 #include "ash/display/display_util.h" |
| 10 #include "ash/rotator/screen_rotation_animator.h" | 10 #include "ash/rotator/screen_rotation_animator.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 if (limiter_) | 146 if (limiter_) |
| 147 limiter_->SetThrottleTimeout(throttle_ms); | 147 limiter_->SetThrottleTimeout(throttle_ms); |
| 148 } | 148 } |
| 149 | 149 |
| 150 bool DisplayConfigurationController::IsLimited() { | 150 bool DisplayConfigurationController::IsLimited() { |
| 151 return limiter_ && limiter_->IsThrottled(); | 151 return limiter_ && limiter_->IsThrottled(); |
| 152 } | 152 } |
| 153 | 153 |
| 154 void DisplayConfigurationController::SetDisplayLayoutImpl( | 154 void DisplayConfigurationController::SetDisplayLayoutImpl( |
| 155 std::unique_ptr<display::DisplayLayout> layout) { | 155 std::unique_ptr<display::DisplayLayout> layout) { |
| 156 // TODO(oshima/stevenjb): Add support for 3+ displays. | |
| 157 display_manager_->SetLayoutForCurrentDisplays(std::move(layout)); | 156 display_manager_->SetLayoutForCurrentDisplays(std::move(layout)); |
| 158 if (display_animator_) | 157 if (display_animator_) |
| 159 display_animator_->StartFadeInAnimation(); | 158 display_animator_->StartFadeInAnimation(); |
| 160 } | 159 } |
| 161 | 160 |
| 162 void DisplayConfigurationController::SetMirrorModeImpl(bool mirror) { | 161 void DisplayConfigurationController::SetMirrorModeImpl(bool mirror) { |
| 163 display_manager_->SetMirrorMode(mirror); | 162 display_manager_->SetMirrorMode(mirror); |
| 164 if (display_animator_) | 163 if (display_animator_) |
| 165 display_animator_->StartFadeInAnimation(); | 164 display_animator_->StartFadeInAnimation(); |
| 166 } | 165 } |
| 167 | 166 |
| 168 void DisplayConfigurationController::SetPrimaryDisplayIdImpl( | 167 void DisplayConfigurationController::SetPrimaryDisplayIdImpl( |
| 169 int64_t display_id) { | 168 int64_t display_id) { |
| 170 window_tree_host_manager_->SetPrimaryDisplayId(display_id); | 169 window_tree_host_manager_->SetPrimaryDisplayId(display_id); |
| 171 if (display_animator_) | 170 if (display_animator_) |
| 172 display_animator_->StartFadeInAnimation(); | 171 display_animator_->StartFadeInAnimation(); |
| 173 } | 172 } |
| 174 | 173 |
| 175 } // namespace ash | 174 } // namespace ash |
| OLD | NEW |