| 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
|
|
|
|
|