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

ui/display/manager/managed_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 UI_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_
 #define UI_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_
 
 #include <stdint.h>
 
 #include <array>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "ui/display/display.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace display {
 
 // A struct that represents all the data required for touch calibration for the
 // display.
-struct DISPLAY_EXPORT TouchCalibrationData {
+struct DISPLAY_MANAGER_EXPORT TouchCalibrationData {
   // CalibrationPointPair.first -> display point
   // CalibrationPointPair.second -> touch point
   using CalibrationPointPair = std::pair<gfx::Point, gfx::Point>;
   using CalibrationPointPairQuad = std::array<CalibrationPointPair, 4>;
   TouchCalibrationData();
   TouchCalibrationData(const CalibrationPointPairQuad& point_pairs,
                        const gfx::Size& bounds);
   TouchCalibrationData(const TouchCalibrationData& calibration_data);
 
   // Calibration point pairs used during calibration. Each point pair contains a
   // display point and the corresponding touch point.
   CalibrationPointPairQuad point_pairs;
 
   // Bounds of the touch display when the calibration was performed.
   gfx::Size bounds;
 };
 
 // A class that represents the display's mode info.
-class DISPLAY_EXPORT ManagedDisplayMode
+class DISPLAY_MANAGER_EXPORT ManagedDisplayMode
     : public base::RefCounted<ManagedDisplayMode> {
  public:
   ManagedDisplayMode();
 
   explicit ManagedDisplayMode(const gfx::Size& size);
 
   ManagedDisplayMode(const gfx::Size& size,
                      float refresh_rate,
                      bool is_interlaced,
                      bool native);
@@ skipping 34 matching lines @@
   bool is_default_ = false;    // True if mode is one with default UI scale.
   float ui_scale_;             // The UI scale factor of the mode.
   float device_scale_factor_;  // The device scale factor of the mode.
 
   DISALLOW_COPY_AND_ASSIGN(ManagedDisplayMode);
 };
 
 // ManagedDisplayInfo contains metadata for each display. This is used to create
 // |Display| as well as to maintain extra infomation to manage displays in ash
 // environment. This class is intentionally made copiable.
-class DISPLAY_EXPORT ManagedDisplayInfo {
+class DISPLAY_MANAGER_EXPORT ManagedDisplayInfo {
  public:
   using ManagedDisplayModeList = std::vector<scoped_refptr<ManagedDisplayMode>>;
 
   // Creates a ManagedDisplayInfo from string spec. 100+200-1440x800 creates
   // display
   // whose size is 1440x800 at the location (100, 200) in host coordinates.
   // The format is
   //
   // [origin-]widthxheight[*device_scale_factor][#resolutions list]
   //     [/<properties>][@ui-scale]
@@ skipping 274 matching lines @@
   gfx::Size maximum_cursor_size_;
 
   // Information associated to touch calibration for the display.
   TouchCalibrationData touch_calibration_data_;
 
   // If you add a new member, you need to update Copy().
 };
 
 // Resets the synthesized display id for testing. This
 // is necessary to avoid overflowing the output index.
-void DISPLAY_EXPORT ResetDisplayIdForTest();
+void DISPLAY_MANAGER_EXPORT ResetDisplayIdForTest();
 
 }  // namespace display
 
 #endif  //  UI_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_