| Index: webkit/plugins/ppapi/ppb_url_loader_impl.h
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_url_loader_impl.h (revision 113301)
|
| +++ webkit/plugins/ppapi/ppb_url_loader_impl.h (working copy)
|
| @@ -11,8 +11,8 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ppapi/c/pp_completion_callback.h"
|
| #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
|
| -#include "ppapi/shared_impl/ppb_url_request_info_shared.h"
|
| #include "ppapi/shared_impl/resource.h"
|
| +#include "ppapi/shared_impl/url_request_info_impl.h"
|
| #include "ppapi/thunk/ppb_url_loader_api.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
|
| #include "webkit/plugins/ppapi/callbacks.h"
|
|
|
| Property changes on: webkit/plugins/ppapi/ppb_url_loader_impl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_url_loader_impl.h:r3734-4217,4606-5108,5177-5263
|
|
|
|
|