Move ash::DisplayInfo to ui

ash/display/display_util.h

 // Copyright 2014 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_UTIL_H_
 #define ASH_DISPLAY_DISPLAY_UTIL_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/common/display/display_info.h"
 #include "base/memory/ref_counted.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/managed_display_info.h"
 
 namespace gfx {
 class Point;
 class Rect;
 class Size;
 }
 
+namespace ui {
+class ManagedDisplayInfo;
+}
+
 namespace ash {
 class AshWindowTreeHost;
 class ManagedDisplayMode;
-class DisplayInfo;
 
 // Creates the display mode list for internal display
 // based on |native_mode|.
-ASH_EXPORT DisplayInfo::ManagedDisplayModeList
+ASH_EXPORT ui::ManagedDisplayInfo::ManagedDisplayModeList
 CreateInternalManagedDisplayModeList(
-    const scoped_refptr<ManagedDisplayMode>& native_mode);
+    const scoped_refptr<ui::ManagedDisplayMode>& native_mode);
 
 // Creates the display mode list for unified display
 // based on |native_mode| and |scales|.
-ASH_EXPORT DisplayInfo::ManagedDisplayModeList
+ASH_EXPORT ui::ManagedDisplayInfo::ManagedDisplayModeList
 CreateUnifiedManagedDisplayModeList(
-    const scoped_refptr<ManagedDisplayMode>& native_mode,
+    const scoped_refptr<ui::ManagedDisplayMode>& native_mode,
     const std::set<std::pair<float, float>>& dsf_scale_list);
 
 // Gets the display mode for |resolution|. Returns false if no display
 // mode matches the resolution, or the display is an internal display.
-ASH_EXPORT scoped_refptr<ManagedDisplayMode> GetDisplayModeForResolution(
-    const DisplayInfo& info,
+ASH_EXPORT scoped_refptr<ui::ManagedDisplayMode> GetDisplayModeForResolution(
+    const ui::ManagedDisplayInfo& info,
     const gfx::Size& resolution);
 
 // Gets the display mode for the next valid UI scale. Returns false
 // if the display is not an internal display.
-ASH_EXPORT scoped_refptr<ManagedDisplayMode> GetDisplayModeForNextUIScale(
-    const DisplayInfo& info,
+ASH_EXPORT scoped_refptr<ui::ManagedDisplayMode> GetDisplayModeForNextUIScale(
+    const ui::ManagedDisplayInfo& info,
     bool up);
 
 // Gets the display mode for the next valid resolution. Returns false
 // if the display is an internal display.
-ASH_EXPORT scoped_refptr<ManagedDisplayMode> GetDisplayModeForNextResolution(
-    const DisplayInfo& info,
-    bool up);
+ASH_EXPORT scoped_refptr<ui::ManagedDisplayMode>
+GetDisplayModeForNextResolution(const ui::ManagedDisplayInfo& info, bool up);
 
 // Sets the UI scale for the |display_id|. Returns false if the
 // display_id is not an internal display.
 ASH_EXPORT bool SetDisplayUIScale(int64_t display_id, float scale);
 
 // Tests if the |info| has display mode that matches |ui_scale|.
-bool HasDisplayModeForUIScale(const DisplayInfo& info, float ui_scale);
+bool HasDisplayModeForUIScale(const ui::ManagedDisplayInfo& info,
+                              float ui_scale);
 
 // Computes the bounds that defines the bounds between two displays.
 // Returns false if two displays do not intersect.
 bool ComputeBoundary(const display::Display& primary_display,
                      const display::Display& secondary_display,
                      gfx::Rect* primary_edge_in_screen,
                      gfx::Rect* secondary_edge_in_screen);
 
 // Creates edge bounds from |bounds_in_screen| that fits the edge
 // of the native window for |ash_host|.
@@ skipping 53 matching lines @@
 #if defined(OS_CHROMEOS)
 // Shows the notification message for display related issues.
 void ShowDisplayErrorNotification(int message_id);
 #endif
 
 ASH_EXPORT base::string16 GetDisplayErrorNotificationMessageForTest();
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_UTIL_H_