Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/display/display_info.h

 // Copyright (c) 2013 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_INFO_H_
 #define ASH_DISPLAY_DISPLAY_INFO_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
@@ skipping 78 matching lines @@
 
   int64 id() const { return id_; }
 
   // The name of the display.
   const std::string& name() const { return name_; }
 
   // True if the display EDID has the overscan flag. This does not create the
   // actual overscan automatically, but used in the message.
   bool has_overscan() const { return has_overscan_; }
 
-  void set_rotation(gfx::Display::Rotation rotation) { rotation_ = rotation; }
-  gfx::Display::Rotation rotation() const { return rotation_; }
-
   void set_touch_support(gfx::Display::TouchSupport support) {
     touch_support_ = support;
   }
   gfx::Display::TouchSupport touch_support() const { return touch_support_; }
 
   void set_touch_device_id(int id) { touch_device_id_ = id; }
   int touch_device_id() const { return touch_device_id_; }
 
   // Gets/Sets the device scale factor of the display.
   float device_scale_factor() const { return device_scale_factor_; }
@@ skipping 13 matching lines @@
   const gfx::Insets& overscan_insets_in_dip() const {
     return overscan_insets_in_dip_;
   }
 
   // Sets/gets configured ui scale. This can be different from the ui
   // scale actually used when the scale is 2.0 and DSF is 2.0.
   // (the effective ui scale is 1.0 in this case).
   float configured_ui_scale() const { return configured_ui_scale_; }
   void set_configured_ui_scale(float scale) { configured_ui_scale_ = scale; }
 
+  // Sets the rotation for the given |source|. Setting a new rotation will also
+  // have it become the active rotation.
+  void SetRotation(gfx::Display::Rotation rotation,
+                   gfx::Display::RotationSource source);
+
+  // Returns the currently active rotation for this display.
+  gfx::Display::Rotation GetActiveRotation() const;
+
+  // Returns the rotation set by a given |source|.
+  gfx::Display::Rotation GetRotation(gfx::Display::RotationSource source) const;
+
   // Returns the ui scale and device scale factor actually used to create
   // display that chrome sees. This can be different from one obtained
   // from dispaly or one specified by a user in following situation.
   // 1) DSF is 2.0f and UI scale is 2.0f. (Returns 1.0f and 1.0f respectiely)
   // 2) A user specified 0.8x on the device that has 1.25 DSF. 1.25 DSF device
   //    uses 1.0f DFS unless 0.8x UI scaling is specified.
   float GetEffectiveDeviceScaleFactor() const;
 
   // Returns the ui scale used for the device scale factor. This
   // return 1.0f if the ui scale and dsf are both set to 2.0.
@@ skipping 72 matching lines @@
   std::string ToFullString() const;
 
  private:
   // Returns true if this display should use DSF=1.25 for UI scaling; i.e.
   // SetUse125DSFForUIScaling(true) is called and this is the internal display.
   bool Use125DSFRorUIScaling() const;
 
   int64 id_;
   std::string name_;
   bool has_overscan_;
-  gfx::Display::Rotation rotation_;
+  std::map<gfx::Display::RotationSource, gfx::Display::Rotation> rotations_;
   gfx::Display::TouchSupport touch_support_;
 
   // If the display is also a touch device, it will have a positive
   // |touch_device_id_|. Otherwise |touch_device_id_| is 0.
   int touch_device_id_;
 
   // This specifies the device's pixel density. (For example, a
   // display whose DPI is higher than the threshold is considered to have
   // device_scale_factor = 2.0 on Chrome OS).  This is used by the
   // grapics layer to choose and draw appropriate images and scale
@@ skipping 34 matching lines @@
 
   // The list of available variations for the color calibration.
   std::vector<ui::ColorCalibrationProfile> available_color_profiles_;
 
   // If you add a new member, you need to update Copy().
 };
 
 }  // namespace ash
 
 #endif  //  ASH_DISPLAY_DISPLAY_INFO_H_