Move ash::DisplayInfo to ui

ui/display/manager/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 ASH_COMMON_DISPLAY_DISPLAY_INFO_H_
-#define ASH_COMMON_DISPLAY_DISPLAY_INFO_H_
+#ifndef UI_DISPLAY_CHROMEOS_DISPLAY_INFO_H_
+#define UI_DISPLAY_CHROMEOS_DISPLAY_INFO_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "ash/ash_export.h"
 #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/types/display_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace ash {
+namespace ui {
 
 // A class that represents the display's mode info.
-class ASH_EXPORT ManagedDisplayMode
+class DISPLAY_EXPORT ManagedDisplayMode
     : public base::RefCounted<ManagedDisplayMode> {
  public:
   ManagedDisplayMode();
 
   ManagedDisplayMode(const gfx::Size& size);
 
   ManagedDisplayMode(const gfx::Size& size,
                      float refresh_rate,
                      bool is_interlaced,
                      bool native);
@@ skipping 31 matching lines @@
   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);
 };
 
 // DisplayInfo contains metadata for each display. This is used to
 // create |display::Display| as well as to maintain extra infomation
 // to manage displays in ash environment.
 // This class is intentionally made copiable.
-class ASH_EXPORT DisplayInfo {
+class DISPLAY_EXPORT DisplayInfo {
  public:
   using ManagedDisplayModeList = std::vector<scoped_refptr<ManagedDisplayMode>>;
 
   // Creates a DisplayInfo 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 262 matching lines @@
   std::vector<ui::ColorCalibrationProfile> available_color_profiles_;
 
   // Maximum cursor size.
   gfx::Size maximum_cursor_size_;
 
   // 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.
-ASH_EXPORT void ResetDisplayIdForTest();
+void DISPLAY_EXPORT ResetDisplayIdForTest();
 
-}  // namespace ash
+}  // namespace ui
 
-#endif  //  ASH_COMMON_DISPLAY_DISPLAY_INFO_H_
+#endif  //  UI_DISPLAY_CHROMEOS_DISPLAY_INFO_H_