Prevent DisplayPreferences from saving incorrect rotations.

ash/content/display/screen_orientation_controller_chromeos.h

Index: ash/content/display/screen_orientation_controller_chromeos.h
diff --git a/ash/content/display/screen_orientation_controller_chromeos.h b/ash/content/display/screen_orientation_controller_chromeos.h
index aa45734a24d31fad96436bc201a0d255fefbb27c..0a84b8cd2964065914bb5798fbb08d4b6ad6b78c 100644
--- a/ash/content/display/screen_orientation_controller_chromeos.h
+++ b/ash/content/display/screen_orientation_controller_chromeos.h
@@ -69,8 +69,11 @@ class ASH_EXPORT ScreenOrientationController
   // display rotation.
   void SetRotationLocked(bool rotation_locked);
 
-  // Sets the display rotation and suppresses display notifications.
-  void SetDisplayRotation(gfx::Display::Rotation rotation);
+  // Sets the display rotation for the given |source|. The new |rotation| will
+  // also become active. Display changed notifications are surpressed for this
+  // change.
+  void SetDisplayRotation(gfx::Display::Rotation rotation,
+                          gfx::Display::RotationSource source);
 
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(aura::Window* gained_active,
@@ -102,7 +105,8 @@ class ASH_EXPORT ScreenOrientationController
   // Sets the display rotation to |rotation|. Future accelerometer updates
   // should not be used to change the rotation. SetRotationLocked(false) removes
   // the rotation lock.
-  void LockRotation(gfx::Display::Rotation rotation);
+  void LockRotation(gfx::Display::Rotation rotation,
+                    gfx::Display::RotationSource source);
 
   // Sets the display rotation based on |lock_orientation|. Future accelerometer
   // updates should not be used to change the rotation. SetRotationLocked(false)