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

Side by Side Diff: content/browser/renderer_host/resource_request_info_impl.cc

Issue 10644011: Revert r143458 (which re-applies r143341 and r142979). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/browser/renderer_host/resource_request_info_impl.h" 5 #include "content/browser/renderer_host/resource_request_info_impl.h"
6 6
7 #include "content/browser/worker_host/worker_service_impl.h" 7 #include "content/browser/worker_host/worker_service_impl.h"
8 #include "content/common/net/url_request_user_data.h" 8 #include "content/common/net/url_request_user_data.h"
9 #include "content/public/browser/global_request_id.h" 9 #include "content/public/browser/global_request_id.h"
10 #include "net/url_request/url_request.h" 10 #include "net/url_request/url_request.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 int64 parent_frame_id, 91 int64 parent_frame_id,
92 ResourceType::Type resource_type, 92 ResourceType::Type resource_type,
93 PageTransition transition_type, 93 PageTransition transition_type,
94 uint64 upload_size, 94 uint64 upload_size,
95 bool is_download, 95 bool is_download,
96 bool allow_download, 96 bool allow_download,
97 bool has_user_gesture, 97 bool has_user_gesture,
98 WebKit::WebReferrerPolicy referrer_policy, 98 WebKit::WebReferrerPolicy referrer_policy,
99 ResourceContext* context) 99 ResourceContext* context)
100 : cross_site_handler_(NULL), 100 : cross_site_handler_(NULL),
101 async_handler_(NULL),
101 process_type_(process_type), 102 process_type_(process_type),
102 child_id_(child_id), 103 child_id_(child_id),
103 route_id_(route_id), 104 route_id_(route_id),
104 origin_pid_(origin_pid), 105 origin_pid_(origin_pid),
105 request_id_(request_id), 106 request_id_(request_id),
106 is_main_frame_(is_main_frame), 107 is_main_frame_(is_main_frame),
107 frame_id_(frame_id), 108 frame_id_(frame_id),
108 parent_is_main_frame_(parent_is_main_frame), 109 parent_is_main_frame_(parent_is_main_frame),
109 parent_frame_id_(parent_frame_id), 110 parent_frame_id_(parent_frame_id),
110 pending_data_count_(0),
111 is_download_(is_download), 111 is_download_(is_download),
112 allow_download_(allow_download), 112 allow_download_(allow_download),
113 has_user_gesture_(has_user_gesture), 113 has_user_gesture_(has_user_gesture),
114 resource_type_(resource_type), 114 resource_type_(resource_type),
115 transition_type_(transition_type), 115 transition_type_(transition_type),
116 upload_size_(upload_size), 116 upload_size_(upload_size),
117 memory_cost_(0), 117 memory_cost_(0),
118 referrer_policy_(referrer_policy), 118 referrer_policy_(referrer_policy),
119 context_(context) { 119 context_(context) {
120 } 120 }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const { 209 GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const {
210 return GlobalRequestID(child_id_, request_id_); 210 return GlobalRequestID(child_id_, request_id_);
211 } 211 }
212 212
213 void ResourceRequestInfoImpl::set_requested_blob_data( 213 void ResourceRequestInfoImpl::set_requested_blob_data(
214 webkit_blob::BlobData* data) { 214 webkit_blob::BlobData* data) {
215 requested_blob_data_ = data; 215 requested_blob_data_ = data;
216 } 216 }
217 217
218 } // namespace content 218 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698