| Index: mojo/services/native_viewport/native_viewport_impl.h
|
| diff --git a/mojo/services/native_viewport/native_viewport_impl.h b/mojo/services/native_viewport/native_viewport_impl.h
|
| index 5043da03608a42544cfa90017c048bdae610fd90..82f38a971963797575deefbbdc3ca4a3c471880e 100644
|
| --- a/mojo/services/native_viewport/native_viewport_impl.h
|
| +++ b/mojo/services/native_viewport/native_viewport_impl.h
|
| @@ -28,11 +28,12 @@ class NativeViewportImpl : public InterfaceImpl<NativeViewport>,
|
| virtual ~NativeViewportImpl();
|
|
|
| // InterfaceImpl<NativeViewport> implementation.
|
| - virtual void Create(SizePtr bounds) OVERRIDE;
|
| + virtual void Create(SizePtr size,
|
| + const Callback<void(uint64_t)>& callback) OVERRIDE;
|
| virtual void Show() OVERRIDE;
|
| virtual void Hide() OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
| - virtual void SetBounds(SizePtr bounds) OVERRIDE;
|
| + virtual void SetSize(SizePtr size) OVERRIDE;
|
| virtual void SubmittedFrame(SurfaceIdPtr surface_id) OVERRIDE;
|
|
|
| // PlatformViewport::Delegate implementation.
|
| @@ -49,11 +50,12 @@ class NativeViewportImpl : public InterfaceImpl<NativeViewport>,
|
| scoped_ptr<PlatformViewport> platform_viewport_;
|
| scoped_ptr<ViewportSurface> viewport_surface_;
|
| uint64_t widget_id_;
|
| - gfx::Rect bounds_;
|
| + gfx::Size size_;
|
| GpuPtr gpu_service_;
|
| SurfacesServicePtr surfaces_service_;
|
| cc::SurfaceId child_surface_id_;
|
| bool waiting_for_event_ack_;
|
| + Callback<void(uint64_t)> create_callback_;
|
| base::WeakPtrFactory<NativeViewportImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeViewportImpl);
|
|
|