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

Unified Diff: ppapi/example/example.cc

Issue 6871040: Rename Instance_Trusted to Instance_Private, wire it up in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: include reordering, minor tweaks Created 9 years, 8 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/example/example.cc
diff --git a/ppapi/example/example.cc b/ppapi/example/example.cc
index d660bc4423e473a634d3064bb9a758f894025434..6f5c9509aa786b4a5024960e6a4166f49871a808 100644
--- a/ppapi/example/example.cc
+++ b/ppapi/example/example.cc
@@ -23,7 +23,7 @@
#include "ppapi/cpp/dev/scriptable_object_deprecated.h"
#include "ppapi/cpp/graphics_2d.h"
#include "ppapi/cpp/image_data.h"
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/private/instance_private.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/private/var_private.h"
#include "ppapi/cpp/rect.h"
@@ -48,7 +48,8 @@ void FillRect(pp::ImageData* image, int left, int top, int width, int height,
class MyScriptableObject : public pp::deprecated::ScriptableObject {
public:
- explicit MyScriptableObject(pp::Instance* instance) : instance_(instance) {}
+ explicit MyScriptableObject(pp::InstancePrivate* instance)
+ : instance_(instance) {}
virtual bool HasMethod(const pp::Var& method, pp::Var* exception) {
return method.AsString() == "toString";
@@ -80,7 +81,7 @@ class MyScriptableObject : public pp::deprecated::ScriptableObject {
}
private:
- pp::Instance* instance_;
+ pp::InstancePrivate* instance_;
};
class MyFetcherClient {
@@ -94,7 +95,7 @@ class MyFetcher {
callback_factory_.Initialize(this);
}
- void Start(const pp::Instance& instance,
+ void Start(const pp::InstancePrivate& instance,
const pp::Var& url,
MyFetcherClient* client) {
pp::URLRequestInfo request;
@@ -157,10 +158,10 @@ class MyFetcher {
std::string data_;
};
-class MyInstance : public pp::Instance, public MyFetcherClient {
+class MyInstance : public pp::InstancePrivate, public MyFetcherClient {
public:
MyInstance(PP_Instance instance)
- : pp::Instance(instance),
+ : pp::InstancePrivate(instance),
time_at_last_check_(0.0),
fetcher_(NULL),
width_(0),

Powered by Google App Engine
This is Rietveld 408576698