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

Unified Diff: ppapi/proxy/enter_proxy.h

Issue 7655002: Convert the pp::proxy namespace to the ppapi::proxy namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/proxy/enter_proxy.h
diff --git a/ppapi/proxy/enter_proxy.h b/ppapi/proxy/enter_proxy.h
index d710c6c5ce78cc4ee4c0fd7b2b91b603425eacea..68527806f4acc7bf42fdb61c1815debe02616c46 100644
--- a/ppapi/proxy/enter_proxy.h
+++ b/ppapi/proxy/enter_proxy.h
@@ -12,7 +12,7 @@
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/thunk/enter.h"
-namespace pp {
+namespace ppapi {
namespace proxy {
// Wrapper around EnterResourceNoLock that takes a host resource. This is used
@@ -23,10 +23,10 @@ namespace proxy {
// never logs errors since we assume the host is doing reasonable things.
template<typename ResourceT>
class EnterPluginFromHostResource
- : public ::ppapi::thunk::EnterResourceNoLock<ResourceT> {
+ : public thunk::EnterResourceNoLock<ResourceT> {
public:
- EnterPluginFromHostResource(const ppapi::HostResource& host_resource)
- : ::ppapi::thunk::EnterResourceNoLock<ResourceT>(
+ EnterPluginFromHostResource(const HostResource& host_resource)
+ : thunk::EnterResourceNoLock<ResourceT>(
PluginResourceTracker::GetInstance()->PluginResourceForHostResource(
host_resource),
false) {
@@ -40,10 +40,10 @@ class EnterPluginFromHostResource
template<typename ResourceT>
class EnterHostFromHostResource
- : public ::ppapi::thunk::EnterResourceNoLock<ResourceT> {
+ : public thunk::EnterResourceNoLock<ResourceT> {
public:
- EnterHostFromHostResource(const ppapi::HostResource& host_resource)
- : ::ppapi::thunk::EnterResourceNoLock<ResourceT>(
+ EnterHostFromHostResource(const HostResource& host_resource)
+ : thunk::EnterResourceNoLock<ResourceT>(
host_resource.host_resource(), false) {
// Validate that we're in the host rather than the plugin. Otherwise this
// object will do the wrong thing. In the host, the instance should have
@@ -91,7 +91,7 @@ class EnterHostFromHostResourceForceCallback
// implementations will use the 1-extra-argument constructor below.
template<class CallbackFactory, typename Method>
EnterHostFromHostResourceForceCallback(
- const ppapi::HostResource& host_resource,
+ const HostResource& host_resource,
CallbackFactory& factory,
Method method)
: EnterHostFromHostResource<ResourceT>(host_resource),
@@ -104,7 +104,7 @@ class EnterHostFromHostResourceForceCallback
// For callbacks that take an extra parameter as a closure.
template<class CallbackFactory, typename Method, typename A>
EnterHostFromHostResourceForceCallback(
- const ppapi::HostResource& host_resource,
+ const HostResource& host_resource,
CallbackFactory& factory,
Method method,
const A& a)
@@ -146,6 +146,6 @@ class EnterHostFromHostResourceForceCallback
};
} // namespace proxy
-} // namespace pp
+} // namespace ppapi
#endif // PPAPI_PROXY_ENTER_PROXY_H_

Powered by Google App Engine
This is Rietveld 408576698