Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1338)

Unified Diff: mojo/services/native_viewport/native_viewport_controller.h

Issue 59383011: Factor common code into native_viewport_controller.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/services/native_viewport/native_viewport_controller.h
diff --git a/mojo/services/native_viewport/native_viewport_controller.h b/mojo/services/native_viewport/native_viewport_controller.h
index 926d42f82ad92e818186360fe573f5fc3488e038..c65c02c2a94fdf3ae4bd46558ced541f257b2c8a 100644
--- a/mojo/services/native_viewport/native_viewport_controller.h
+++ b/mojo/services/native_viewport/native_viewport_controller.h
@@ -10,6 +10,10 @@
#include "mojo/public/system/core.h"
#include "mojo/services/native_viewport/native_viewport.h"
+namespace gpu {
+class GLInProcessContext;
+}
+
namespace mojo {
namespace services {
@@ -26,16 +30,19 @@ class NativeViewportController : public services::NativeViewportDelegate {
private:
// Overridden from services::NativeViewportDelegate:
+ virtual void OnResized(const gfx::Size& size) OVERRIDE;
+ virtual void OnAcceleratedWidgetAvailable(
+ gfx::AcceleratedWidget widget) OVERRIDE;
virtual bool OnEvent(ui::Event* event) OVERRIDE;
virtual void OnDestroyed() OVERRIDE;
- virtual void OnGLContextAvailable(gpu::gles2::GLES2Interface*) OVERRIDE;
- virtual void OnGLContextLost() OVERRIDE;
- virtual void OnResized(const gfx::Size& size) OVERRIDE;
+
+ void OnGLContextLost();
void SendString(const std::string& string);
Handle pipe_;
scoped_ptr<NativeViewport> native_viewport_;
+ scoped_ptr<gpu::GLInProcessContext> gl_context_;
DISALLOW_COPY_AND_ASSIGN(NativeViewportController);
};
« no previous file with comments | « mojo/services/native_viewport/native_viewport_android.cc ('k') | mojo/services/native_viewport/native_viewport_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698