Introduce DisplayConfigurationController

ash/display/screen_orientation_controller_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
-#include "ash/rotator/screen_rotation_animator.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/accelerometer/accelerometer_types.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/chromeos/accelerometer/accelerometer_util.h"
 #include "ui/gfx/display.h"
@@ skipping 116 matching lines @@
 
 void ScreenOrientationController::SetDisplayRotation(
     gfx::Display::Rotation rotation,
     gfx::Display::RotationSource source) {
   if (!gfx::Display::HasInternalDisplay())
     return;
   current_rotation_ = rotation;
   base::AutoReset<bool> auto_ignore_display_configuration_updates(
       &ignore_display_configuration_updates_, true);
 
-  ash::ScreenRotationAnimator screen_rotation_animator(
-      gfx::Display::InternalDisplayId());
-  if (screen_rotation_animator.CanAnimate()) {
-    screen_rotation_animator.Rotate(rotation, source);
-  } else {
-    Shell::GetInstance()->display_manager()->SetDisplayRotation(
-        gfx::Display::InternalDisplayId(), rotation, source);
-  }
+  Shell::GetInstance()->display_configuration_controller()->SetDisplayRotation(
+      gfx::Display::InternalDisplayId(), rotation, source,
+      true /* user_action */);
 }
 
 void ScreenOrientationController::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   ApplyLockForActiveWindow();
 }
 
 // Currently contents::WebContents will only be able to lock rotation while
@@ skipping 254 matching lines @@
 }
 
 bool ScreenOrientationController::CanRotateInLockedState() {
   return rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockLandscape ||
          rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockPortrait;
 }
 
 }  // namespace ash