Store rotation/ui scale to local state.

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 15 matching lines @@
 namespace test {
 class DisplayManagerTestApi;
 class SystemGestureEventFilterTest;
 }
 namespace internal {
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
 // This is exported for unittest.
 //
-// TODO(oshima): gfx::Screen needs to return translated coordinates
-// if the root window is translated. crbug.com/119268.
+// TODO(oshima): Make this non internal.
 class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
  public:
   DisplayManager();
   virtual ~DisplayManager();
 
   // Used to emulate display change when run in a desktop environment instead
   // of on a device.
   static void CycleDisplay();
   static void ToggleDisplayScaleFactor();
 
+  // Returns next valud ui scales.

[James Cook, 2013/03/22 16:53:14]

"Returns next valid UI scale."

[oshima, 2013/03/22 18:20:42]

Done.

+  static float GetNextUIScale(float scale, bool up);
+
   // When set to true, the MonitorManager calls OnDisplayBoundsChanged
   // even if the display's bounds didn't change. Used to swap primary
   // display.
   void set_force_bounds_changed(bool force_bounds_changed) {
     force_bounds_changed_ = force_bounds_changed;
   }
 
   // Returns the display id of the first display in the outupt list.
   int64 first_display_id() const { return first_display_id_; }
 
@@ skipping 24 matching lines @@
 
   // Clears the overscan insets
   void ClearCustomOverscanInsets(int64 display_id);
 
   // Sets the display's rotation.
   void SetDisplayRotation(int64 display_id, gfx::Display::Rotation rotation);
 
   // Sets the display's ui scale.
   void SetDisplayUIScale(int64 display_id, float ui_scale);
 
+  // Register per display properties. |overscan_insets| is NULL if
+  // the display has no custom overscan insets.
+  void RegisterDisplayProperty(int64 display_id,
+                               gfx::Display::Rotation rotation,
+                               float ui_scale,
+                               const gfx::Insets* overscan_insets);
+
   // Tells if display rotation/ui scaling features are enabled.
   bool IsDisplayRotationEnabled() const;
   bool IsDisplayUIScalingEnabled() const;
 
   // Returns the current overscan insets for the specified |display_id|.
   // Returns an empty insets (0, 0, 0, 0) if no insets are specified for
   // the display.
   gfx::Insets GetOverscanInsets(int64 display_id) const;
 
   // Called when display configuration has changed. The new display
   // configurations is passed as a vector of Display object, which
   // contains each display's new infomration.
   void OnNativeDisplaysChanged(
       const std::vector<DisplayInfo>& display_info_list);
 
   // Updates the internal display data and notifies observers about the changes.
   void UpdateDisplays(const std::vector<DisplayInfo>& display_info_list);
 
+  // Updates current displays using current |display_info_|.
+  void UpdateDisplays();
+
   // Obsoleted: Do not use in new code.
   // Returns the display at |index|. The display at 0 is
   // no longer considered "primary".
   gfx::Display* GetDisplayAt(size_t index);
 
   const gfx::Display* GetPrimaryDisplayCandidate() const;
 
   // Returns the logical number of displays. This returns 1
   // when displays are mirrored.
   size_t GetNumDisplays() const;
 
   // Returns the number of connected displays. This returns 2
   // when displays are mirrored.
   size_t num_connected_displays() const { return num_connected_displays_; }
 
   int64 mirrored_display_id() const { return mirrored_display_id_; }
 
   // Returns the display object nearest given |window|.
   const gfx::Display& GetDisplayNearestPoint(
       const gfx::Point& point) const;
 
   // Returns the display object nearest given |point|.
   const gfx::Display& GetDisplayNearestWindow(
       const aura::Window* window) const;
 
   // Returns the display that most closely intersects |match_rect|.
   const gfx::Display& GetDisplayMatching(
       const gfx::Rect& match_rect)const;
 
-  // Retuns the display info associated with |display|.
-  const DisplayInfo& GetDisplayInfo(const gfx::Display& display) const;
+  // Retuns the display info associated with |display_id|.
+  const DisplayInfo& GetDisplayInfo(int64 display_id) const;
 
   // Returns the human-readable name for the display |id|.
   std::string GetDisplayNameForId(int64 id);
 
   // RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& new_size) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
@@ skipping 63 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_