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

Unified Diff: ppapi/proxy/proxy_object_var.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/proxy_object_var.h
diff --git a/ppapi/proxy/proxy_object_var.h b/ppapi/proxy/proxy_object_var.h
index c07177ee6300fba7d0c8af6bfa952479fd3201e5..e8d7aedddc54bf5254bbb1359fafa21db2479084 100644
--- a/ppapi/proxy/proxy_object_var.h
+++ b/ppapi/proxy/proxy_object_var.h
@@ -8,20 +8,18 @@
#include "base/compiler_specific.h"
#include "ppapi/shared_impl/var.h"
-namespace pp {
+namespace ppapi {
+
namespace proxy {
class PluginDispatcher;
} // namespace proxy
-} // namespace pp
-
-namespace ppapi {
// Tracks a reference to an object var in the plugin side of the proxy. This
// just stores the dispatcher and host var ID, and provides the interface for
// integrating this with PP_Var creation.
class ProxyObjectVar : public Var {
public:
- ProxyObjectVar(pp::proxy::PluginDispatcher* dispatcher,
+ ProxyObjectVar(proxy::PluginDispatcher* dispatcher,
int32 host_var_id);
virtual ~ProxyObjectVar();
@@ -31,7 +29,7 @@ class ProxyObjectVar : public Var {
virtual PP_Var GetPPVar() OVERRIDE;
virtual PP_VarType GetType() const OVERRIDE;
- pp::proxy::PluginDispatcher* dispatcher() const { return dispatcher_; }
+ proxy::PluginDispatcher* dispatcher() const { return dispatcher_; }
int32 host_var_id() const { return host_var_id_; }
// Expose AssignVarID on Var so the PluginResourceTracker can call us when
@@ -39,7 +37,7 @@ class ProxyObjectVar : public Var {
void AssignVarID(int32 id);
private:
- pp::proxy::PluginDispatcher* dispatcher_;
+ proxy::PluginDispatcher* dispatcher_;
int32 host_var_id_;
DISALLOW_COPY_AND_ASSIGN(ProxyObjectVar);

Powered by Google App Engine
This is Rietveld 408576698