| 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_manager.h" | 8 #include "ash/display/display_manager.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" |
| 11 #include "ash/screen_util.h" | |
| 12 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 13 #include "ui/display/manager/display_layout.h" | 12 #include "ui/display/manager/display_layout.h" |
| 14 | 13 |
| 15 #if defined(OS_CHROMEOS) | 14 #if defined(OS_CHROMEOS) |
| 16 #include "ash/display/display_animator_chromeos.h" | 15 #include "ash/display/display_animator_chromeos.h" |
| 17 #include "base/sys_info.h" | 16 #include "base/sys_info.h" |
| 18 #include "grit/ash_strings.h" | 17 #include "grit/ash_strings.h" |
| 19 #endif | 18 #endif |
| 20 | 19 |
| 21 namespace { | 20 namespace { |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 } | 169 } |
| 171 | 170 |
| 172 void DisplayConfigurationController::SetPrimaryDisplayIdImpl( | 171 void DisplayConfigurationController::SetPrimaryDisplayIdImpl( |
| 173 int64_t display_id) { | 172 int64_t display_id) { |
| 174 window_tree_host_manager_->SetPrimaryDisplayId(display_id); | 173 window_tree_host_manager_->SetPrimaryDisplayId(display_id); |
| 175 if (display_animator_) | 174 if (display_animator_) |
| 176 display_animator_->StartFadeInAnimation(); | 175 display_animator_->StartFadeInAnimation(); |
| 177 } | 176 } |
| 178 | 177 |
| 179 } // namespace ash | 178 } // namespace ash |
| OLD | NEW |