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

Unified Diff: ppapi/proxy/plugin_resource_tracker.h

Issue 7623018: Move host resource from the proxy to the shared_impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed 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
« no previous file with comments | « ppapi/proxy/plugin_resource.cc ('k') | ppapi/proxy/plugin_resource_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/plugin_resource_tracker.h
diff --git a/ppapi/proxy/plugin_resource_tracker.h b/ppapi/proxy/plugin_resource_tracker.h
index d313a9fbb8f7345be763497760688dc51842c857..f788c6c135b6989e86d0b82b892fea920e4c0bd9 100644
--- a/ppapi/proxy/plugin_resource_tracker.h
+++ b/ppapi/proxy/plugin_resource_tracker.h
@@ -14,8 +14,8 @@
#include "ppapi/c/pp_stdint.h"
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/pp_var.h"
-#include "ppapi/proxy/host_resource.h"
#include "ppapi/proxy/plugin_var_tracker.h"
+#include "ppapi/shared_impl/host_resource.h"
#include "ppapi/shared_impl/tracker_base.h"
template<typename T> struct DefaultSingletonTraits;
@@ -59,7 +59,7 @@ class PluginResourceTracker : public ::ppapi::TrackerBase {
// Given a host resource, maps it to an existing plugin resource ID if it
// exists, or returns 0 on failure.
PP_Resource PluginResourceForHostResource(
- const HostResource& resource) const;
+ const ppapi::HostResource& resource) const;
PluginVarTracker& var_tracker() {
return var_tracker_test_override_ ? *var_tracker_test_override_
@@ -118,7 +118,7 @@ class PluginResourceTracker : public ::ppapi::TrackerBase {
ResourceMap resource_map_;
// Map of host instance/resource pairs to a plugin resource ID.
- typedef std::map<HostResource, PP_Resource> HostResourceMap;
+ typedef std::map<ppapi::HostResource, PP_Resource> HostResourceMap;
HostResourceMap host_resource_map_;
// Tracks the last ID we've sent out as a plugin resource so we don't send
« no previous file with comments | « ppapi/proxy/plugin_resource.cc ('k') | ppapi/proxy/plugin_resource_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698