[Cleanup] Factor out layout store code from DisplayController

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 16 matching lines @@
 class Rect;
 }
 
 namespace ash {
 class AcceleratorControllerTest;
 namespace test {
 class DisplayManagerTestApi;
 class SystemGestureEventFilterTest;
 }
 namespace internal {
+class DisplayLayoutStore;
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
 // This is exported for unittest.
 //
 // TODO(oshima): Make this non internal.
 class ASH_EXPORT DisplayManager :
 #if defined(OS_CHROMEOS)
       public chromeos::OutputConfigurator::SoftwareMirroringController,
 #endif
       public aura::RootWindowObserver {
  public:
   DisplayManager();
   virtual ~DisplayManager();
 
   // Returns the list of possible UI scales for the display.
   static std::vector<float> GetScalesForDisplay(const DisplayInfo& info);
 
   // Returns next valid UI scale.
   static float GetNextUIScale(const DisplayInfo& info, bool up);
 
   // Updates the bounds of |secondary_display| according to |layout|.
   static void UpdateDisplayBoundsForLayout(
       const DisplayLayout& layout,
       const gfx::Display& primary_display,
       gfx::Display* secondary_display);
 
+  DisplayLayoutStore* layout_store() {
+    return layout_store_.get();
+  }
+
   // 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 157 matching lines @@
   gfx::Display CreateDisplayFromDisplayInfoById(int64 display_id);
 
   // Updates the bounds of the secondary display in |display_list|
   // using the layout registered for the display pair and set the
   // index of display updated to |updated_index|. Returns true
   // if the secondary display's bounds has been changed from current
   // value, or false otherwise.
   bool UpdateSecondaryDisplayBoundsForLayout(DisplayList* display_list,
                                              size_t* updated_index) const;
 
+  scoped_ptr<DisplayLayoutStore> layout_store_;
+
   int64 first_display_id_;
 
   gfx::Display mirrored_display_;
 
   // List of current active dispays.
   DisplayList displays_;
 
   int num_connected_displays_;
 
   bool force_bounds_changed_;
@@ skipping 12 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_