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

Side by Side Diff: webkit/plugins/ppapi/ppb_url_request_info_impl.h

Issue 8824015: Revert 113290 - Rename the shared_impl resource files to give them more regular names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_url_request_info_impl.h:r3734-4217,4606-5108,5177-5263
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_URL_REQUEST_INFO_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_URL_REQUEST_INFO_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPB_URL_REQUEST_INFO_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPB_URL_REQUEST_INFO_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "ppapi/thunk/ppb_url_request_info_api.h" 9 #include "ppapi/thunk/ppb_url_request_info_api.h"
10 #include "ppapi/shared_impl/ppb_url_request_info_shared.h" 10 #include "ppapi/shared_impl/url_request_info_impl.h"
11 #include "webkit/plugins/webkit_plugins_export.h" 11 #include "webkit/plugins/webkit_plugins_export.h"
12 12
13 namespace WebKit { 13 namespace WebKit {
14 class WebFrame; 14 class WebFrame;
15 class WebHTTPBody; 15 class WebHTTPBody;
16 class WebURLRequest; 16 class WebURLRequest;
17 } 17 }
18 18
19 namespace webkit { 19 namespace webkit {
20 namespace ppapi { 20 namespace ppapi {
21 21
22 class WEBKIT_PLUGINS_EXPORT PPB_URLRequestInfo_Impl : 22 class WEBKIT_PLUGINS_EXPORT PPB_URLRequestInfo_Impl :
23 public ::ppapi::PPB_URLRequestInfo_Shared { 23 public ::ppapi::URLRequestInfoImpl {
24 public: 24 public:
25 explicit PPB_URLRequestInfo_Impl( 25 explicit PPB_URLRequestInfo_Impl(
26 PP_Instance instance, 26 PP_Instance instance,
27 const ::ppapi::PPB_URLRequestInfo_Data& data); 27 const ::ppapi::PPB_URLRequestInfo_Data& data);
28 virtual ~PPB_URLRequestInfo_Impl(); 28 virtual ~PPB_URLRequestInfo_Impl();
29 29
30 // Creates the WebKit URL request from the current request info. Returns 30 // Creates the WebKit URL request from the current request info. Returns
31 // true on success, false if the request is invalid (in which case *dest may 31 // true on success, false if the request is invalid (in which case *dest may
32 // be partially initialized). 32 // be partially initialized).
33 bool ToWebURLRequest(WebKit::WebFrame* frame, 33 bool ToWebURLRequest(WebKit::WebFrame* frame,
(...skipping 18 matching lines...) Expand all
52 PP_Time expected_last_modified_time, 52 PP_Time expected_last_modified_time,
53 WebKit::WebHTTPBody *http_body); 53 WebKit::WebHTTPBody *http_body);
54 54
55 DISALLOW_COPY_AND_ASSIGN(PPB_URLRequestInfo_Impl); 55 DISALLOW_COPY_AND_ASSIGN(PPB_URLRequestInfo_Impl);
56 }; 56 };
57 57
58 } // namespace ppapi 58 } // namespace ppapi
59 } // namespace webkit 59 } // namespace webkit
60 60
61 #endif // WEBKIT_PLUGINS_PPAPI_PPB_URL_REQUEST_INFO_IMPL_H_ 61 #endif // WEBKIT_PLUGINS_PPAPI_PPB_URL_REQUEST_INFO_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppb_url_loader_impl.h ('k') | webkit/plugins/ppapi/ppb_url_request_info_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698