Move ash::DisplayInfo to ui

ash/touch/touch_transformer_controller.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_TOUCH_TOUCH_TRANSFORMER_CONTROLLER_H_
 #define ASH_TOUCH_TOUCH_TRANSFORMER_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
@@ skipping 35 matching lines @@
 
   // Returns a transform that will be used to change an event's location from
   // the touchscreen's coordinate system into |display|'s coordinate system.
   // The transform is also responsible for properly scaling the display if the
   // display supports panel fitting.
   //
   // On X11 events are reported in framebuffer coordinate space, so the
   // |framebuffer_size| is used for scaling.
   // On Ozone events are reported in the touchscreen's resolution, so
   // |touch_display| is used to determine the size and scale the event.
-  gfx::Transform GetTouchTransform(const DisplayInfo& display,
-                                   const DisplayInfo& touch_display,
-                                   const ui::TouchscreenDevice& touchscreen,
-                                   const gfx::Size& framebuffer_size) const;
+  gfx::Transform GetTouchTransform(
+      const display::ManagedDisplayInfo& display,
+      const display::ManagedDisplayInfo& touch_display,
+      const ui::TouchscreenDevice& touchscreen,
+      const gfx::Size& framebuffer_size) const;
 
   // Returns the scaling factor for the touch radius such that it scales the
   // radius from |touch_device|'s coordinate system to the |touch_display|'s
   // coordinate system.
   double GetTouchResolutionScale(
-      const DisplayInfo& touch_display,
+      const display::ManagedDisplayInfo& touch_display,
       const ui::TouchscreenDevice& touch_device) const;
 
   // For the provided |display| update the touch radius mapping.
-  void UpdateTouchRadius(const DisplayInfo& display) const;
+  void UpdateTouchRadius(const display::ManagedDisplayInfo& display) const;
 
   // For a given |target_display| and |target_display_id| update the touch
   // transformation based on the touchscreen associated with |touch_display|.
   // |target_display_id| is the display id whose root window will receive the
   // touch events.
   // |touch_display| is the physical display that has the touchscreen
   // from which the events arrive.
   // |target_display| provides the dimensions to which the touch event will be
   // transformed.
-  void UpdateTouchTransform(int64_t target_display_id,
-                            const DisplayInfo& touch_display,
-                            const DisplayInfo& target_display) const;
+  void UpdateTouchTransform(
+      int64_t target_display_id,
+      const display::ManagedDisplayInfo& touch_display,
+      const display::ManagedDisplayInfo& target_display) const;
 
   DISALLOW_COPY_AND_ASSIGN(TouchTransformerController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_TOUCH_TOUCH_TRANSFORMER_CONTROLLER_H_