Index: mojo/examples/pepper_container_app/pepper_spinning_cube_demo/spinning_cube.h |
diff --git a/mojo/examples/sample_app/spinning_cube.h b/mojo/examples/pepper_container_app/pepper_spinning_cube_demo/spinning_cube.h |
similarity index 58% |
copy from mojo/examples/sample_app/spinning_cube.h |
copy to mojo/examples/pepper_container_app/pepper_spinning_cube_demo/spinning_cube.h |
index 9cd78b8f899ca8bbe1e7b1ba858dd012b7962a4e..f210948ba5ee4795c580569896d5f404e31b9209 100644 |
--- a/mojo/examples/sample_app/spinning_cube.h |
+++ b/mojo/examples/pepper_container_app/pepper_spinning_cube_demo/spinning_cube.h |
@@ -1,13 +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 MOJO_EXAMPLES_PEPPER_CONTAINER_APP_PEPPER_SPINNING_CUBE_DEMO_SPINNING_CUBE_H_ |
+#define MOJO_EXAMPLES_PEPPER_CONTAINER_APP_PEPPER_SPINNING_CUBE_DEMO_SPINNING_CUBE_H_ |
-#include <stdint.h> |
- |
-#include "base/memory/scoped_ptr.h" |
+#include "ppapi/c/pp_stdint.h" |
namespace mojo { |
namespace examples { |
@@ -29,12 +27,17 @@ 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_; |
}; |
@@ -42,4 +45,4 @@ class SpinningCube { |
} // namespace examples |
} // namespace mojo |
-#endif // MOJO_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_ |
+#endif // MOJO_EXAMPLES_PEPPER_CONTAINER_APP_PEPPER_SPINNING_CUBE_DEMO_SPINNING_CUBE_H_ |