| Index: ash/touch/touch_transformer_controller.h
|
| diff --git a/ash/touch/touch_transformer_controller.h b/ash/touch/touch_transformer_controller.h
|
| index 2c6cb35df700308184a63ad7c9ac2b217b71f1d6..640fcbb8c8f499de202b8db3080bafbbe691e33c 100644
|
| --- a/ash/touch/touch_transformer_controller.h
|
| +++ b/ash/touch/touch_transformer_controller.h
|
| @@ -53,20 +53,21 @@ class ASH_EXPORT TouchTransformerController
|
| // |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|.
|
| @@ -76,9 +77,10 @@ class ASH_EXPORT TouchTransformerController
|
| // 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);
|
| };
|
|
|