Index: mojo/services/native_viewport/native_viewport.h |
diff --git a/mojo/services/native_viewport/native_viewport.h b/mojo/services/native_viewport/native_viewport.h |
index f2f2692ebcabb48e87d2b00f4dbc562145c09f39..a2ffebb2be72decb2c4cc0ae5eb488a7ef610921 100644 |
--- a/mojo/services/native_viewport/native_viewport.h |
+++ b/mojo/services/native_viewport/native_viewport.h |
@@ -6,16 +6,8 @@ |
#define MOJO_SERVICES_NATIVE_VIEWPORT_NATIVE_VIEWPORT_H_ |
#include "base/memory/scoped_ptr.h" |
- |
-namespace gfx { |
-class Size; |
-} |
- |
-namespace gpu { |
-namespace gles2 { |
-class GLES2Interface; |
-} |
-} |
+#include "ui/gfx/native_widget_types.h" |
+#include "ui/gfx/size.h" |
namespace ui { |
class Event; |
@@ -32,11 +24,10 @@ class NativeViewportDelegate { |
public: |
virtual ~NativeViewportDelegate() {} |
+ virtual void OnResized(const gfx::Size& size) = 0; |
+ virtual void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) = 0; |
virtual bool OnEvent(ui::Event* event) = 0; |
virtual void OnDestroyed() = 0; |
- virtual void OnGLContextAvailable(gpu::gles2::GLES2Interface* gl) = 0; |
- virtual void OnGLContextLost() = 0; |
- virtual void OnResized(const gfx::Size& size) = 0; |
}; |
// Encapsulation of platform-specific Viewport. |
@@ -44,6 +35,7 @@ class NativeViewport { |
public: |
virtual ~NativeViewport() {} |
+ virtual gfx::Size GetSize() = 0; |
virtual void Close() = 0; |
static scoped_ptr<NativeViewport> Create(shell::Context* context, |