Rename gfx::Display/Screen to display::Display/Screen in ash

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/display/display_info.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
-#include "ui/gfx/display.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace aura {
 class Window;
 }
 
 namespace chromeos {
 class DisplayNotificationsTest;
 }
 
 namespace gfx {
-class Display;
 class Insets;
 class Rect;
-class Screen;
 }
 
 namespace ash {
 class AcceleratorControllerTest;
 class DisplayLayoutStore;
 class MouseWarpController;
 class ScreenAsh;
 
 typedef std::vector<DisplayInfo> DisplayInfoList;
 
@@ skipping 84 matching lines @@
 
   // Returns the current display list.
   display::DisplayIdList GetCurrentDisplayIdList() const;
 
   // Sets the layout for the current display pair. The |layout| specifies
   // the locaion of the displays relative to their parents.
   void SetLayoutForCurrentDisplays(
       std::unique_ptr<display::DisplayLayout> layout);
 
   // Returns display for given |id|;
-  const gfx::Display& GetDisplayForId(int64_t id) const;
+  const display::Display& GetDisplayForId(int64_t id) const;
 
   // Finds the display that contains |point| in screeen coordinates.
   // Returns invalid display if there is no display that can satisfy
   // the condition.
-  const gfx::Display& FindDisplayContainingPoint(
+  const display::Display& FindDisplayContainingPoint(
       const gfx::Point& point_in_screen) const;
 
   // Sets the work area's |insets| to the display given by |display_id|.
   bool UpdateWorkAreaOfDisplay(int64_t display_id, const gfx::Insets& insets);
 
   // Registers the overscan insets for the display of the specified ID. Note
   // that the insets size should be specified in DIP size. It also triggers the
   // display's bounds change.
   void SetOverscanInsets(int64_t display_id, const gfx::Insets& insets_in_dip);
 
   // Sets the display's rotation for the given |source|. The new |rotation| will
   // also become active.
   void SetDisplayRotation(int64_t display_id,
-                          gfx::Display::Rotation rotation,
-                          gfx::Display::RotationSource source);
+                          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 DisplayMode& display_mode);
 
   // Register per display properties. |overscan_insets| is NULL if
   // the display has no custom overscan insets.
   void RegisterDisplayProperty(int64_t display_id,
-                               gfx::Display::Rotation rotation,
+                               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,
-                                         gfx::Display::Rotation rotation);
+                                         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 |gfx::Display::Rotate_0|.
-  gfx::Display::Rotation registered_internal_display_rotation() const {
+  // 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.
   DisplayMode 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.
   bool GetSelectedModeForDisplayId(int64_t display_id,
                                    DisplayMode* mode_out) const;
@@ skipping 17 matching lines @@
       const std::vector<DisplayInfo>& display_info_list);
 
   // Updates the internal display data and notifies observers about the changes.
   void UpdateDisplaysWith(const std::vector<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 gfx::Display& GetDisplayAt(size_t index) const;
+  const display::Display& GetDisplayAt(size_t index) const;
 
-  const gfx::Display& GetPrimaryDisplayCandidate() const;
+  const display::Display& GetPrimaryDisplayCandidate() const;
 
   // Returns the logical number of displays. This returns 1
   // when displays are mirrored.
   size_t GetNumDisplays() const;
 
   const display::DisplayList& active_display_list() const {
     return active_display_list_;
   }
 
   // Returns true if the display specified by |display_id| is currently
@@ skipping 13 matching lines @@
 
   // Sets/gets if the unified desktop feature is enabled.
   void SetUnifiedDesktopEnabled(bool enabled);
   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 gfx::Display GetMirroringDisplayById(int64_t id) const;
+  const display::Display GetMirroringDisplayById(int64_t id) const;
 
   // Retuns the display info associated with |display_id|.
   const 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
@@ skipping 70 matching lines @@
   };
 
   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);
 
-  gfx::Display* FindDisplayForId(int64_t id);
+  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_|
   // can be different from |new_info| (due to overscan state), so
   // you must use |GetDisplayInfo| to get the correct DisplayInfo for
   // a display.
   void InsertAndUpdateDisplayInfo(const DisplayInfo& new_info);
 
   // Called when the display info is updated through InsertAndUpdateDisplayInfo.
   void OnDisplayInfoUpdated(const DisplayInfo& display_info);
 
   // Creates a display object from the DisplayInfo for |display_id|.
-  gfx::Display CreateDisplayFromDisplayInfoById(int64_t display_id);
+  display::Display CreateDisplayFromDisplayInfoById(int64_t display_id);
 
   // Creates a display object from the DisplayInfo for |display_id| for
   // mirroring. The size of the display will be scaled using |scale|
   // with the offset using |origin|.
-  gfx::Display CreateMirroringDisplayFromDisplayInfoById(
+  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
   // the layout registered for the display pair. For more than 2 displays,
   // the bounds are updated using horizontal layout.
   void UpdateNonPrimaryDisplayBoundsForLayout(
@@ skipping 41 matching lines @@
   MultiDisplayMode multi_display_mode_;
   MultiDisplayMode current_default_multi_display_mode_;
 
   int64_t mirroring_display_id_;
   display::DisplayList software_mirroring_display_list_;
 
   // User preference for rotation lock of the internal display.
   bool registered_internal_display_rotation_lock_;
 
   // User preference for the rotation of the internal display.
-  gfx::Display::Rotation registered_internal_display_rotation_;
+  display::Display::Rotation registered_internal_display_rotation_;
 
   bool unified_desktop_enabled_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_