Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/display/display_manager.h

 // Copyright (c) 2012 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_DISPLAY_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 133 matching lines @@
       const gfx::Point& point_in_screen) const;
 
   // Sets the work area's |insets| to the display given by |display_id|.
   bool UpdateWorkAreaOfDisplay(int64 display_id, const gfx::Insets& insets);
 
   // Registers the overscan insets for the display of the specified ID. Note
   // that the insets size should be specified in DIP size. It also triggers the
   // display's bounds change.
   void SetOverscanInsets(int64 display_id, const gfx::Insets& insets_in_dip);
 
-  // Sets the display's rotation.
-  void SetDisplayRotation(int64 display_id, gfx::Display::Rotation rotation);
+  // Sets the display's rotation for the given |source|. The new |rotation| will
+  // also become active.
+  void SetDisplayRotation(int64 display_id,
+                          gfx::Display::Rotation rotation,
+                          gfx::Display::RotationSource source);
 
   // Sets the display's ui scale. Returns true if it's successful, or
   // false otherwise.  TODO(mukai): remove this and merge into
   // SetDisplayMode.
   bool SetDisplayUIScale(int64 display_id, float ui_scale);
 
   // Sets the display's resolution.
   // TODO(mukai): remove this and merge into SetDisplayMode.
   void SetDisplayResolution(int64 display_id, const gfx::Size& resolution);
 
@@ skipping 234 matching lines @@
   gfx::Display::Rotation registered_internal_display_rotation_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_