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

Unified Diff: ppapi/examples/gles2_spinning_cube/spinning_cube.h

Issue 178953003: Mojo container example for hosting Pepper plugins (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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: ppapi/examples/gles2_spinning_cube/spinning_cube.h
diff --git a/mojo/examples/sample_app/spinning_cube.h b/ppapi/examples/gles2_spinning_cube/spinning_cube.h
similarity index 59%
copy from mojo/examples/sample_app/spinning_cube.h
copy to ppapi/examples/gles2_spinning_cube/spinning_cube.h
index 9cd78b8f899ca8bbe1e7b1ba858dd012b7962a4e..84a302c2dec0c7cc96673183dd4c30da0cc07639 100644
--- a/mojo/examples/sample_app/spinning_cube.h
+++ b/ppapi/examples/gles2_spinning_cube/spinning_cube.h
@@ -1,16 +1,11 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
-#define MOJO_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
+#ifndef PPAPI_EXAMPLES_GLES2_SPINNING_CUBE_SPINNING_CUBE_H_
+#define PPAPI_EXAMPLES_GLES2_SPINNING_CUBE_SPINNING_CUBE_H_
-#include <stdint.h>
-
-#include "base/memory/scoped_ptr.h"
-
-namespace mojo {
-namespace examples {
+#include "ppapi/c/pp_stdint.h"
class SpinningCube {
public:
@@ -29,17 +24,19 @@ class SpinningCube {
private:
class GLState;
+ // Disallow copy and assign.
+ SpinningCube(const SpinningCube& other);
+ SpinningCube& operator=(const SpinningCube& other);
+
void Update();
bool initialized_;
uint32_t width_;
uint32_t height_;
- scoped_ptr<GLState> state_;
+ // Owned ptr.
+ GLState* state_;
float fling_multiplier_;
int direction_;
};
-} // namespace examples
-} // namespace mojo
-
-#endif // MOJO_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
+#endif // PPAPI_EXAMPLES_GLES2_SPINNING_CUBE_SPINNING_CUBE_H_
« no previous file with comments | « ppapi/examples/gles2_spinning_cube/gles2_spinning_cube.html ('k') | ppapi/examples/gles2_spinning_cube/spinning_cube.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698