diff options
| author | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 19:40:54 +0000 |
|---|---|---|
| committer | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 19:40:54 +0000 |
| commit | 37027147e508f367a23f7d392ef3d453a96d065b (patch) | |
| tree | 7458f1cc528957c93a2d6aaa14913761cf0ca658 /remoting | |
| parent | f7b28d07ca2310391c23ad415668bb7a24ab78ef (diff) | |
| download | chromium_src-37027147e508f367a23f7d392ef3d453a96d065b.zip chromium_src-37027147e508f367a23f7d392ef3d453a96d065b.tar.gz chromium_src-37027147e508f367a23f7d392ef3d453a96d065b.tar.bz2 | |
Fix up PPAPI renames in Chrome.
BUG=57631
TEST=ppapi/tests pass
Review URL: http://codereview.chromium.org/3537011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/chromoting_scriptable_object.cc | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/chromoting_scriptable_object.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index c03f287..142d9d5 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -156,7 +156,7 @@ bool ChromotingInstance::HandleInputEvent(const PP_InputEvent& event) { pp::Var ChromotingInstance::GetInstanceObject() { LOG(ERROR) << "Getting instance object."; - if (instance_object_.is_void()) { + if (instance_object_.is_undefined()) { ChromotingScriptableObject* object = new ChromotingScriptableObject(this); object->Init(); diff --git a/remoting/client/plugin/chromoting_scriptable_object.cc b/remoting/client/plugin/chromoting_scriptable_object.cc index 2ed3929..a54b39a 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.cc +++ b/remoting/client/plugin/chromoting_scriptable_object.cc @@ -125,7 +125,7 @@ Var ChromotingScriptableObject::Call(const Var& method_name, PropertyNameMap::const_iterator iter = property_names_.find(method_name.AsString()); if (iter == property_names_.end()) { - return pp::ScriptableObject::Call(method_name, args, exception); + return pp::deprecated::ScriptableObject::Call(method_name, args, exception); } return (this->*(properties_[iter->second].method))(args, exception); diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index 5344271..8c30da0 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -33,14 +33,14 @@ #include <string> #include <vector> -#include "third_party/ppapi/cpp/scriptable_object.h" +#include "third_party/ppapi/cpp/dev/scriptable_object_deprecated.h" #include "third_party/ppapi/cpp/var.h" namespace remoting { class ChromotingInstance; -class ChromotingScriptableObject : public pp::ScriptableObject { +class ChromotingScriptableObject : public pp::deprecated::ScriptableObject { public: explicit ChromotingScriptableObject(ChromotingInstance* instance); virtual ~ChromotingScriptableObject(); |