Store rotation/ui scale to local state.

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 <string>
 
 #include "ash/ash_export.h"
@@ skipping 75 matching lines @@
   const gfx::Size& size_in_pixel() const { return size_in_pixel_; }
 
   // The overscan insets for the display in DIP.
   const gfx::Insets& overscan_insets_in_dip() const {
     return overscan_insets_in_dip_;
   }
 
   float ui_scale() const { return ui_scale_; }
   void set_ui_scale(float scale) { ui_scale_ = scale; }
 
-  // Copy the display info except for two fields that can be modified by a user
-  // (|has_custom_overscan_insets_| and |custom_overscan_insets_in_dip_|).
-  void CopyFromNative(const DisplayInfo& native_info);
+  // Copy the display info except for fields that can be modified by a user
+  // (|has_custom_overscan_insets_| and |custom_overscan_insets_in_dip_|,
+  //  |rotation_| and |ui_scale_|). |rotation_| and |ui_scale_| are copied
+  // when the |another_info| isn't native one.
+  void Copy(const DisplayInfo& another_info);
 
   // Update the |bounds_in_pixel_| and |size_in_pixel_| using
   // given |bounds_in_pixel|.
   void SetBounds(const gfx::Rect& bounds_in_pixel);
 
   // Update the |bounds_in_pixel| according to the current overscan
   // and rotation settings.
   // 1) If this has custom overscan insets
   //    (i.e. |has_custom_overscan_insets_| is true), it simply applies
   //    the existing |overscan_insets_in_dip_|.
   // 2) If this doesn't have custom overscan insets but the display claims
   //    that it has overscan (|has_overscan_| is true), then updates
   //    |overscan_insets_in_dip_| to default value (5% of the display size)
   //    and apply the insets.
   // 3) Otherwise, clear the overscan insets.
   void UpdateDisplaySize();
 
   // Sets/Clears the overscan insets.
   void SetOverscanInsets(bool custom,
                          const gfx::Insets& insets_in_dip);
   gfx::Insets GetOverscanInsetsInPixel() const;
+
   void clear_has_custom_overscan_insets() {
     has_custom_overscan_insets_ = false;
   }
+  bool has_custom_overscan_insets() const {
+    return has_custom_overscan_insets_;
+  }
+
+  void set_native(bool native) { native_ = native; }
+  bool native() const { return native_; }
 
   // Returns a string representation of the DisplayInfo;
   std::string ToString() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets);
   // Set the overscan flag. Used for test.
   void set_has_overscan_for_test(bool has_overscan) {
     has_overscan_ = has_overscan;
   }
 
   int64 id_;
   std::string name_;
   bool has_overscan_;
   gfx::Display::Rotation rotation_;
   float device_scale_factor_;
   gfx::Rect bounds_in_pixel_;
   // The size of the display in use. The size can be different from the size
   // of |bounds_in_pixel_| if the display has overscan insets and/or rotation.
   gfx::Size size_in_pixel_;
   gfx::Insets overscan_insets_in_dip_;
 
   // True if the |overscan_insets_in_dip| is specified by a user. This
   // is used not to override the insets by native insets.
   bool has_custom_overscan_insets_;
 
   // UI scale of the display.
   float ui_scale_;
+
+  // True if this comes from native platform (DisplayChangeObserverX11).
+  bool native_;
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  //  ASH_DISPLAY_DISPLAY_INFO_H_