summaryrefslogtreecommitdiffstats
path: root/content/ppapi_plugin
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 19:22:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 19:22:53 +0000
commit55cdf605cda8900f0c6c4d8098fb1ba951767fd2 (patch)
tree05f1d89fdf3f46d1cfd4350ee169ca9c282ae5e0 /content/ppapi_plugin
parente1873b977ecb681d9261d9ce9fbe606e036b7d5b (diff)
downloadchromium_src-55cdf605cda8900f0c6c4d8098fb1ba951767fd2.zip
chromium_src-55cdf605cda8900f0c6c4d8098fb1ba951767fd2.tar.gz
chromium_src-55cdf605cda8900f0c6c4d8098fb1ba951767fd2.tar.bz2
Convert audio-related messages to the new thunk/API system for Pepper.
This has a bit of a change from the previous couple of resources that were converted in that the ResourceCreationProxy now calls a static proxy function for actually doing the work. It became too complicated and required that the ResourceCreationProxy know a lot about the internals of the objects. Did a little namespace cleanup. This renames "pp::shared_impl" to just use the "ppapi" namespace. The "shared_impl" was ugly and didn't help anything. Some files in that directory used "ppapi::shared_impl" instead which was even more confusing. Do a little build cleanup. The old ppapi_shared_proxy.gypi is now split into two sub-files, one for ppapi_shared, and one for ppapi_proxy. It's hopefully easier to find stuff now. Review URL: http://codereview.chromium.org/7014024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
-rw-r--r--content/ppapi_plugin/ppapi_thread.cc2
-rw-r--r--content/ppapi_plugin/ppapi_thread.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 73c0d5f..eb698da 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -83,7 +83,7 @@ std::set<PP_Instance>* PpapiThread::GetGloballySeenInstanceIDSet() {
return &globally_seen_instance_ids_;
}
-pp::shared_impl::WebKitForwarding* PpapiThread::GetWebKitForwarding() {
+ppapi::WebKitForwarding* PpapiThread::GetWebKitForwarding() {
if (!webkit_forwarding_.get())
webkit_forwarding_.reset(new webkit::ppapi::WebKitForwardingImpl);
return webkit_forwarding_.get();
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h
index 5b7e3c4..d230be781 100644
--- a/content/ppapi_plugin/ppapi_thread.h
+++ b/content/ppapi_plugin/ppapi_thread.h
@@ -37,7 +37,7 @@ class PpapiThread : public ChildThread,
virtual base::MessageLoopProxy* GetIPCMessageLoop();
virtual base::WaitableEvent* GetShutdownEvent();
virtual std::set<PP_Instance>* GetGloballySeenInstanceIDSet();
- virtual pp::shared_impl::WebKitForwarding* GetWebKitForwarding();
+ virtual ppapi::WebKitForwarding* GetWebKitForwarding();
virtual void PostToWebKitThread(const tracked_objects::Location& from_here,
const base::Closure& task);
@@ -75,7 +75,7 @@ class PpapiThread : public ChildThread,
std::set<PP_Instance> globally_seen_instance_ids_;
// Lazily created by GetWebKitForwarding.
- scoped_ptr<pp::shared_impl::WebKitForwarding> webkit_forwarding_;
+ scoped_ptr<ppapi::WebKitForwarding> webkit_forwarding_;
scoped_ptr<PpapiWebKitThread> webkit_thread_;