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