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

Unified Diff: webkit/plugins/ppapi/quota_file_io.cc

Issue 8342016: Revert 106142 - Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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 | « webkit/plugins/ppapi/ppb_video_capture_impl.cc ('k') | webkit/plugins/ppapi/resource_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/quota_file_io.cc
===================================================================
--- webkit/plugins/ppapi/quota_file_io.cc (revision 106147)
+++ webkit/plugins/ppapi/quota_file_io.cc (working copy)
@@ -12,7 +12,6 @@
#include "base/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/task.h"
-#include "webkit/plugins/ppapi/host_globals.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
#include "webkit/plugins/ppapi/resource_helper.h"
#include "webkit/plugins/ppapi/resource_tracker.h"
@@ -271,8 +270,7 @@
}
PluginDelegate* QuotaFileIO::GetPluginDelegate() const {
- PluginInstance* instance =
- HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance_);
+ PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance_);
if (instance)
return instance->delegate();
return NULL;
Property changes on: webkit/plugins/ppapi/quota_file_io.cc
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/quota_file_io.cc:r3734-4217,4606-5108,5177-5263
« no previous file with comments | « webkit/plugins/ppapi/ppb_video_capture_impl.cc ('k') | webkit/plugins/ppapi/resource_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698