Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/content/display/screen_orientation_controller_chromeos.h

 // 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.
 
 #ifndef ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_
 #define ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_
 
 #include <map>
 
 #include "ash/ash_export.h"
@@ skipping 51 matching lines @@
   }
 
   // True if |rotation_lock_| has been set and accelerometer updates should not
   // rotate the display.
   bool rotation_locked() const { return rotation_locked_; }
 
   // If |rotation_locked| future accelerometer updates should not change the
   // 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,
                          aura::Window* lost_active) override;
 
   // aura::WindowObserver:
   void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
   void OnWindowDestroying(aura::Window* window) override;
 
   // chromeos::AccelerometerReader::Observer:
@@ skipping 11 matching lines @@
   void OnDisplayConfigurationChanged() override;
 
   // ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
  private:
   // 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)
   // removes the rotation lock.
   void LockRotationToOrientation(
       blink::WebScreenOrientationLockType lock_orientation);
 
   // Locks rotation to the angle matching the primary orientation for
   // |lock_orientation|.
   void LockRotationToPrimaryOrientation(
@@ skipping 64 matching lines @@
   // Tracks all windows that have requested a lock, as well as the requested
   // orientation.
   std::map<aura::Window*, blink::WebScreenOrientationLockType> locking_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_