| Index: services/native_viewport/platform_viewport.h
|
| diff --git a/services/native_viewport/platform_viewport.h b/services/native_viewport/platform_viewport.h
|
| index 3713ed9581728d44c9a15fb541cdad7d81788102..69bc4c7b2624f2017df531061a9b8e368eebdb77 100644
|
| --- a/services/native_viewport/platform_viewport.h
|
| +++ b/services/native_viewport/platform_viewport.h
|
| @@ -6,6 +6,7 @@
|
| #define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
|
| #include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/size.h"
|
| @@ -14,10 +15,6 @@ namespace gfx {
|
| class Rect;
|
| }
|
|
|
| -namespace ui {
|
| -class Event;
|
| -}
|
| -
|
| namespace native_viewport {
|
|
|
| // Encapsulation of platform-specific Viewport.
|
| @@ -31,7 +28,7 @@ class PlatformViewport {
|
| virtual void OnAcceleratedWidgetAvailable(
|
| gfx::AcceleratedWidget widget) = 0;
|
| virtual void OnAcceleratedWidgetDestroyed() = 0;
|
| - virtual bool OnEvent(ui::Event* ui_event) = 0;
|
| + virtual bool OnEvent(mojo::EventPtr event) = 0;
|
| virtual void OnDestroyed() = 0;
|
| };
|
|
|
| @@ -44,9 +41,6 @@ class PlatformViewport {
|
| virtual gfx::Size GetSize() = 0;
|
| virtual void SetBounds(const gfx::Rect& bounds) = 0;
|
|
|
| - virtual void SetCapture() = 0;
|
| - virtual void ReleaseCapture() = 0;
|
| -
|
| static scoped_ptr<PlatformViewport> Create(Delegate* delegate);
|
| };
|
|
|
|
|