Move ash::DisplayInfo 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>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/common/display/display_info.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_info.h"
 #include "ui/display/manager/display_layout.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace aura {
 class Window;
 }
 
 namespace chromeos {
 class DisplayNotificationsTest;
 }
 
 namespace display {
 class DisplayLayoutStore;
 }
 
 namespace gfx {
 class Insets;
 class Rect;
 }
 
 namespace ash {
 class AcceleratorControllerTest;
 class MouseWarpController;
 class ScreenAsh;
 
-typedef std::vector<DisplayInfo> DisplayInfoList;
+using DisplayInfoList = std::vector<ui::DisplayInfo>;
 
 namespace test {
 class AshTestBase;
 class DisplayManagerTestApi;
 class SystemGestureEventFilterTest;
 }
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
 //
@@ skipping 99 matching lines @@
   // Sets the display's rotation for the given |source|. The new |rotation| will
   // also become active.
   void SetDisplayRotation(int64_t display_id,
                           display::Display::Rotation rotation,
                           display::Display::RotationSource source);
 
   // Sets the external display's configuration, including resolution change,
   // ui-scale change, and device scale factor change. Returns true if it changes
   // the display resolution so that the caller needs to show a notification in
   // case the new resolution actually doesn't work.
-  bool SetDisplayMode(int64_t display_id,
-                      const scoped_refptr<ManagedDisplayMode>& display_mode);
+  bool SetDisplayMode(
+      int64_t display_id,
+      const scoped_refptr<ui::ManagedDisplayMode>& display_mode);
 
   // Register per display properties. |overscan_insets| is NULL if
   // the display has no custom overscan insets.
   void RegisterDisplayProperty(int64_t display_id,
                                display::Display::Rotation rotation,
                                float ui_scale,
                                const gfx::Insets* overscan_insets,
                                const gfx::Size& resolution_in_pixels,
                                float device_scale_factor,
                                ui::ColorCalibrationProfile color_profile);
 
   // Register stored rotation properties for the internal display.
   void RegisterDisplayRotationProperties(bool rotation_lock,
                                          display::Display::Rotation rotation);
 
   // Returns the stored rotation lock preference if it has been loaded,
   // otherwise false.
   bool registered_internal_display_rotation_lock() const {
     return registered_internal_display_rotation_lock_;
   }
 
   // Returns the stored rotation preference for the internal display if it has
   // been loaded, otherwise |display::Display::Rotate_0|.
   display::Display::Rotation registered_internal_display_rotation() const {
     return registered_internal_display_rotation_;
   }
 
   // Returns the display mode of |display_id| which is currently used.
-  scoped_refptr<ManagedDisplayMode> GetActiveModeForDisplayId(
+  scoped_refptr<ui::ManagedDisplayMode> GetActiveModeForDisplayId(
       int64_t display_id) const;
 
   // Returns the display's selected mode. This returns false and doesn't
   // set |mode_out| if the display mode is in default.
-  scoped_refptr<ManagedDisplayMode> GetSelectedModeForDisplayId(
+  scoped_refptr<ui::ManagedDisplayMode> GetSelectedModeForDisplayId(
       int64_t display_id) const;
 
   // Tells if the virtual resolution feature is enabled.
   bool IsDisplayUIScalingEnabled() const;
 
   // Returns the current overscan insets for the specified |display_id|.
   // Returns an empty insets (0, 0, 0, 0) if no insets are specified for
   // the display.
   gfx::Insets GetOverscanInsets(int64_t display_id) const;
 
   // Sets the color calibration of the display to |profile|.
   void SetColorCalibrationProfile(int64_t display_id,
                                   ui::ColorCalibrationProfile profile);
 
   // Called when display configuration has changed. The new display
   // configurations is passed as a vector of Display object, which
   // contains each display's new infomration.
   void OnNativeDisplaysChanged(
-      const std::vector<DisplayInfo>& display_info_list);
+      const std::vector<ui::DisplayInfo>& display_info_list);
 
   // Updates the internal display data and notifies observers about the changes.
-  void UpdateDisplaysWith(const std::vector<DisplayInfo>& display_info_list);
+  void UpdateDisplaysWith(
+      const std::vector<ui::DisplayInfo>& display_info_list);
 
   // Updates current displays using current |display_info_|.
   void UpdateDisplays();
 
   // Returns the display at |index|. The display at 0 is
   // no longer considered "primary".
   const display::Display& GetDisplayAt(size_t index) const;
 
   const display::Display& GetPrimaryDisplayCandidate() const;
 
@@ skipping 34 matching lines @@
   bool unified_desktop_enabled() const { return unified_desktop_enabled_; }
 
   // Returns true if it's in unified desktop mode.
   bool IsInUnifiedMode() const;
 
   // Returns the display used for software mirrroring. Returns invalid
   // display if not found.
   const display::Display GetMirroringDisplayById(int64_t id) const;
 
   // Retuns the display info associated with |display_id|.
-  const DisplayInfo& GetDisplayInfo(int64_t display_id) const;
+  const ui::DisplayInfo& GetDisplayInfo(int64_t display_id) const;
 
   // Returns the human-readable name for the display |id|.
   std::string GetDisplayNameForId(int64_t id);
 
   // Returns the display id that is capable of UI scaling. On device,
   // this returns internal display's ID if its device scale factor is 2,
   // or invalid ID if such internal display doesn't exist. On linux
   // desktop, this returns the first display ID.
   int64_t GetDisplayIdForUIScaling() const;
 
@@ skipping 53 matching lines @@
                            NativeDisplaysChangedAfterPrimaryChange);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, Rotate);
   friend class AcceleratorControllerTest;
   friend class DisplayManagerTest;
   friend class chromeos::DisplayNotificationsTest;
   friend class test::AshTestBase;
   friend class test::DisplayManagerTestApi;
   friend class test::SystemGestureEventFilterTest;
 
-  typedef std::vector<DisplayInfo> DisplayInfoList;
-
   bool software_mirroring_enabled() const {
     return multi_display_mode_ == MIRRORING;
   };
 
   void set_change_display_upon_host_resize(bool value) {
     change_display_upon_host_resize_ = value;
   }
 
   // Creates software mirroring display related information. The display
   // used to mirror the content is removed from the |display_info_list|.
   void CreateSoftwareMirroringDisplayInfo(DisplayInfoList* display_info_list);
 
   display::Display* FindDisplayForId(int64_t id);
 
   // Add the mirror display's display info if the software based
   // mirroring is in use.
   void AddMirrorDisplayInfoIfAny(DisplayInfoList* display_info_list);
 
-  // Inserts and update the DisplayInfo according to the overscan
-  // state. Note that The DisplayInfo stored in the |internal_display_info_|
+  // Inserts and update the ui::DisplayInfo according to the overscan
+  // state. Note that The ui::DisplayInfo stored in the |internal_display_info_|
   // can be different from |new_info| (due to overscan state), so
-  // you must use |GetDisplayInfo| to get the correct DisplayInfo for
+  // you must use |GetDisplayInfo| to get the correct ui::DisplayInfo for
   // a display.
-  void InsertAndUpdateDisplayInfo(const DisplayInfo& new_info);
+  void InsertAndUpdateDisplayInfo(const ui::DisplayInfo& new_info);
 
   // Called when the display info is updated through InsertAndUpdateDisplayInfo.
-  void OnDisplayInfoUpdated(const DisplayInfo& display_info);
+  void OnDisplayInfoUpdated(const ui::DisplayInfo& display_info);
 
-  // Creates a display object from the DisplayInfo for |display_id|.
+  // Creates a display object from the ui::DisplayInfo for |display_id|.
   display::Display CreateDisplayFromDisplayInfoById(int64_t display_id);
 
-  // Creates a display object from the DisplayInfo for |display_id| for
+  // Creates a display object from the ui::DisplayInfo for |display_id| for
   // mirroring. The size of the display will be scaled using |scale|
   // with the offset using |origin|.
   display::Display CreateMirroringDisplayFromDisplayInfoById(
       int64_t display_id,
       const gfx::Point& origin,
       float scale);
 
   // Updates the bounds of all non-primary displays in |display_list| and
   // append the indices of displays updated to |updated_indices|.
   // When the size of |display_list| equals 2, the bounds are updated using
@@ skipping 31 matching lines @@
   // True if active_display_list is being modified and has displays that are not
   // presently active.
   // See https://crbug.com/632755
   bool is_updating_display_list_;
 
   int num_connected_displays_;
 
   bool force_bounds_changed_;
 
   // The mapping from the display ID to its internal data.
-  std::map<int64_t, DisplayInfo> display_info_;
+  std::map<int64_t, ui::DisplayInfo> display_info_;
 
   // Selected display modes for displays. Key is the displays' ID.
-  std::map<int64_t, scoped_refptr<ManagedDisplayMode>> display_modes_;
+  std::map<int64_t, scoped_refptr<ui::ManagedDisplayMode>> display_modes_;
 
   // When set to true, the host window's resize event updates
   // the display's size. This is set to true when running on
   // desktop environment (for debugging) so that resizing the host
   // window will update the display properly. This is set to false
   // on device as well as during the unit tests.
   bool change_display_upon_host_resize_;
 
   MultiDisplayMode multi_display_mode_;
   MultiDisplayMode current_default_multi_display_mode_;
@@ skipping 10 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_