Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/rotator/screen_rotation_animator.h

Index: ash/rotator/screen_rotation_animator.h
diff --git a/ash/rotator/screen_rotation_animator.h b/ash/rotator/screen_rotation_animator.h
index 055e755906dc483d95f4da29cc666749d893eb66..89c17848f46127fa81b3838751a1f779992b3884 100644
--- a/ash/rotator/screen_rotation_animator.h
+++ b/ash/rotator/screen_rotation_animator.h
@@ -17,8 +17,10 @@ class ASH_EXPORT ScreenRotationAnimator {
   explicit ScreenRotationAnimator(int64 display_id);
   ~ScreenRotationAnimator();
 
-  // Rotates |display_| to the |new_rotation| orientation.
-  void Rotate(gfx::Display::Rotation new_rotation);
+  // Rotates |display_| to the |new_rotation| orientation, for the given
+  // |source|. The rotation will also become active.
+  void Rotate(gfx::Display::Rotation new_rotation,
+              gfx::Display::RotationSource source);
 
  private:
   // The id of the display to rotate.