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

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

Issue 669073003: Get rid of net::LOAD_ENABLE_UPLOAD_PROGRESS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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/loader/resource_request_info_impl.h" 5 #include "content/browser/loader/resource_request_info_impl.h"
6 6
7 #include "content/browser/loader/global_routing_id.h" 7 #include "content/browser/loader/global_routing_id.h"
8 #include "content/browser/loader/resource_message_filter.h" 8 #include "content/browser/loader/resource_message_filter.h"
9 #include "content/common/net/url_request_user_data.h" 9 #include "content/common/net/url_request_user_data.h"
10 #include "content/public/browser/global_request_id.h" 10 #include "content/public/browser/global_request_id.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 false, // parent_is_main_frame 42 false, // parent_is_main_frame
43 0, // parent_render_frame_id 43 0, // parent_render_frame_id
44 resource_type, // resource_type 44 resource_type, // resource_type
45 ui::PAGE_TRANSITION_LINK, // transition_type 45 ui::PAGE_TRANSITION_LINK, // transition_type
46 false, // should_replace_current_entry 46 false, // should_replace_current_entry
47 false, // is_download 47 false, // is_download
48 false, // is_stream 48 false, // is_stream
49 true, // allow_download 49 true, // allow_download
50 false, // has_user_gesture 50 false, // has_user_gesture
51 false, // enable load timing 51 false, // enable load timing
52 false, // enable upload progress
52 blink::WebReferrerPolicyDefault, // referrer_policy 53 blink::WebReferrerPolicyDefault, // referrer_policy
53 blink::WebPageVisibilityStateVisible, // visibility_state 54 blink::WebPageVisibilityStateVisible, // visibility_state
54 context, // context 55 context, // context
55 base::WeakPtr<ResourceMessageFilter>(), // filter 56 base::WeakPtr<ResourceMessageFilter>(), // filter
56 is_async); // is_async 57 is_async); // is_async
57 info->AssociateWithRequest(request); 58 info->AssociateWithRequest(request);
58 } 59 }
59 60
60 // static 61 // static
61 bool ResourceRequestInfo::GetRenderFrameForRequest( 62 bool ResourceRequestInfo::GetRenderFrameForRequest(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool parent_is_main_frame, 98 bool parent_is_main_frame,
98 int parent_render_frame_id, 99 int parent_render_frame_id,
99 ResourceType resource_type, 100 ResourceType resource_type,
100 ui::PageTransition transition_type, 101 ui::PageTransition transition_type,
101 bool should_replace_current_entry, 102 bool should_replace_current_entry,
102 bool is_download, 103 bool is_download,
103 bool is_stream, 104 bool is_stream,
104 bool allow_download, 105 bool allow_download,
105 bool has_user_gesture, 106 bool has_user_gesture,
106 bool enable_load_timing, 107 bool enable_load_timing,
108 bool enable_upload_progress,
107 blink::WebReferrerPolicy referrer_policy, 109 blink::WebReferrerPolicy referrer_policy,
108 blink::WebPageVisibilityState visibility_state, 110 blink::WebPageVisibilityState visibility_state,
109 ResourceContext* context, 111 ResourceContext* context,
110 base::WeakPtr<ResourceMessageFilter> filter, 112 base::WeakPtr<ResourceMessageFilter> filter,
111 bool is_async) 113 bool is_async)
112 : cross_site_handler_(NULL), 114 : cross_site_handler_(NULL),
113 detachable_handler_(NULL), 115 detachable_handler_(NULL),
114 process_type_(process_type), 116 process_type_(process_type),
115 child_id_(child_id), 117 child_id_(child_id),
116 route_id_(route_id), 118 route_id_(route_id),
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 base::WeakPtr<ResourceMessageFilter> filter) { 257 base::WeakPtr<ResourceMessageFilter> filter) {
256 child_id_ = child_id; 258 child_id_ = child_id;
257 route_id_ = route_id; 259 route_id_ = route_id;
258 origin_pid_ = origin_pid; 260 origin_pid_ = origin_pid;
259 request_id_ = request_id; 261 request_id_ = request_id;
260 parent_render_frame_id_ = parent_render_frame_id; 262 parent_render_frame_id_ = parent_render_frame_id;
261 filter_ = filter; 263 filter_ = filter;
262 } 264 }
263 265
264 } // namespace content 266 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698