Merge Prevent DisplayPreferences from saving incorrect rotations.

ui/gfx/display.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 UI_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 12 matching lines @@
 class GFX_EXPORT Display {
  public:
   // Screen Rotation in clock-wise degrees.
   enum Rotation {
     ROTATE_0 = 0,
     ROTATE_90,
     ROTATE_180,
     ROTATE_270,
   };
 
+  // The display rotation can have multiple causes for change. A user can set a
+  // preference. On devices with accelerometers, they can change the rotation.
+  // RotationSource allows for the tracking of a Rotation per source of the
+  // change. ROTATION_SOURCE_ACTIVE is the current rotation of the display.
+  // Rotation changes not due to an accelerometer, nor the user, are to use this
+  // source directly.
+  enum RotationSource {
+    ROTATION_SOURCE_ACCELEROMETER = 0,
+    ROTATION_SOURCE_ACTIVE,
+    ROTATION_SOURCE_USER,
+  };
+
   // Touch support for the display.
   enum TouchSupport {
     TOUCH_SUPPORT_UNKNOWN,
     TOUCH_SUPPORT_AVAILABLE,
     TOUCH_SUPPORT_UNAVAILABLE,
   };
 
   // Creates a display with kInvalidDisplayID as default.
   Display();
   explicit Display(int64 id);
@@ skipping 86 matching lines @@
   Rect bounds_;
   Rect work_area_;
   float device_scale_factor_;
   Rotation rotation_;
   TouchSupport touch_support_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_