Move DisplayLayoutStore from ash to ui.

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 16 matching lines @@
 #endif
 
 namespace aura {
 class Window;
 }
 
 namespace chromeos {
 class DisplayNotificationsTest;
 }
 
+namespace display {
+class DisplayLayoutStore;
+}
+
 namespace gfx {
 class Insets;
 class Rect;
 }
 
 namespace ash {
 class AcceleratorControllerTest;
-class DisplayLayoutStore;
 class MouseWarpController;
 class ScreenAsh;
 
 typedef std::vector<DisplayInfo> DisplayInfoList;
 
 namespace test {
 class AshTestBase;
 class DisplayManagerTestApi;
 class SystemGestureEventFilterTest;
 }
@@ skipping 40 matching lines @@
   // The display ID for a virtual display assigned to a unified desktop.
   static int64_t kUnifiedDisplayId;
 
   DisplayManager();
 #if defined(OS_CHROMEOS)
   ~DisplayManager() override;
 #else
   virtual ~DisplayManager();
 #endif
 
-  DisplayLayoutStore* layout_store() { return layout_store_.get(); }
+  display::DisplayLayoutStore* layout_store() { return layout_store_.get(); }
 
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
   // When set to true, the DisplayManager calls OnDisplayMetricsChanged
   // 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;
   }
 
@@ skipping 292 matching lines @@
   // Applies the |layout| and updates the bounds of displays in |display_list|.
   // |updated_ids| contains the ids for displays whose bounds have changed.
   void ApplyDisplayLayout(const display::DisplayLayout& layout,
                           display::DisplayList* display_list,
                           std::vector<int64_t>* updated_ids);
 
   Delegate* delegate_;  // not owned.
 
   std::unique_ptr<ScreenAsh> screen_;
 
-  std::unique_ptr<DisplayLayoutStore> layout_store_;
+  std::unique_ptr<display::DisplayLayoutStore> layout_store_;
 
   int64_t first_display_id_;
 
   // List of current active displays.
   display::DisplayList active_display_list_;
   // This list does not include the displays that will be removed if
   // |UpdateDisplaysWith| is under execution.
   // See https://crbug.com/632755
   display::DisplayList active_only_display_list_;
 
@@ skipping 34 matching lines @@
   bool unified_desktop_enabled_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_