| Index: webkit/plugins/ppapi/ppb_url_request_info_impl.h
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_url_request_info_impl.h (revision 113419)
|
| +++ webkit/plugins/ppapi/ppb_url_request_info_impl.h (working copy)
|
| @@ -7,7 +7,7 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "ppapi/thunk/ppb_url_request_info_api.h"
|
| -#include "ppapi/shared_impl/url_request_info_impl.h"
|
| +#include "ppapi/shared_impl/ppb_url_request_info_shared.h"
|
| #include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| namespace WebKit {
|
| @@ -20,7 +20,7 @@
|
| namespace ppapi {
|
|
|
| class WEBKIT_PLUGINS_EXPORT PPB_URLRequestInfo_Impl :
|
| - public ::ppapi::URLRequestInfoImpl {
|
| + public ::ppapi::PPB_URLRequestInfo_Shared {
|
| public:
|
| explicit PPB_URLRequestInfo_Impl(
|
| PP_Instance instance,
|
|
|
| Property changes on: webkit/plugins/ppapi/ppb_url_request_info_impl.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
| Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_url_request_info_impl.h:r3734-4217,4606-5108,5177-5263
|
|
|
|
|