Split //ui/display and create //ui/display/manager.

ui/display/manager/display_layout.h

 // Copyright 2016 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 UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_
 #define UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 
 namespace display {
 class Display;
 
 // An identifier used to manage display layout in DisplayManager /
 // DisplayLayoutStore.
 using DisplayIdList = std::vector<int64_t>;
 
 using Displays = std::vector<Display>;
 
 // DisplayPlacement specifies where the display (D) is placed relative to
 // parent (P) display. In the following example, D given by |display_id| is
 // placed at the left side of P given by |parent_display_id|, with a negative
 // offset and a top-left offset reference.
 //
 //        +      +--------+
 // offset |      |        |
 //        +      |   D    +--------+
 //               |        |        |
 //               +--------+   P    |
 //                        |        |
 //                        +--------+
 //
-struct DISPLAY_EXPORT DisplayPlacement {
+struct DISPLAY_MANAGER_EXPORT DisplayPlacement {
   // The id of the display this placement will be applied to.
   int64_t display_id;
 
   // The parent display id to which the above display is placed.
   int64_t parent_display_id;
 
   // To which side the parent display the display is positioned.
   enum Position { TOP, RIGHT, BOTTOM, LEFT };
   Position position;
 
@@ skipping 20 matching lines @@
 
   DisplayPlacement& Swap();
 
   std::string ToString() const;
 
   static std::string PositionToString(Position position);
   static bool StringToPosition(const base::StringPiece& string,
                                Position* position);
 };
 
-class DISPLAY_EXPORT DisplayLayout final {
+class DISPLAY_MANAGER_EXPORT DisplayLayout final {
  public:
   DisplayLayout();
   ~DisplayLayout();
 
   // Applies the layout to the displays in |display_list|.
   // |updated_ids| (optional) contains the ids for displays whose bounds have
   // changed. |minimum_offset_overlap| represents the minimum required overlap
   // between displays.
   void ApplyToDisplayList(Displays* display_list,
                           std::vector<int64_t>* updated_ids,
@@ skipping 32 matching lines @@
   static bool ApplyDisplayPlacement(const DisplayPlacement& placement,
                                     Displays* display_list,
                                     int minimum_offset_overlap);
 
   DISALLOW_COPY_AND_ASSIGN(DisplayLayout);
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_