Index: webkit/plugins/ppapi/ppb_file_ref_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_file_ref_impl.cc (revision 113419) |
+++ webkit/plugins/ppapi/ppb_file_ref_impl.cc (working copy) |
@@ -80,14 +80,14 @@ |
PPB_FileRef_Impl::PPB_FileRef_Impl(const PPB_FileRef_CreateInfo& info, |
PPB_FileSystem_Impl* file_system) |
- : FileRefImpl(FileRefImpl::InitAsImpl(), info), |
+ : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsImpl(), info), |
file_system_(file_system), |
external_file_system_path_() { |
} |
PPB_FileRef_Impl::PPB_FileRef_Impl(const PPB_FileRef_CreateInfo& info, |
const FilePath& external_file_path) |
- : FileRefImpl(FileRefImpl::InitAsImpl(), info), |
+ : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsImpl(), info), |
file_system_(), |
external_file_system_path_(external_file_path) { |
} |
Property changes on: webkit/plugins/ppapi/ppb_file_ref_impl.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_file_ref_impl.cc:r3734-4217,4606-5108,5177-5263 |