OLD | NEW |
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/browser/worker_host/worker_service_impl.h" | 9 #include "content/browser/worker_host/worker_service_impl.h" |
10 #include "content/common/net/url_request_user_data.h" | 10 #include "content/common/net/url_request_user_data.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 0, // origin_pid | 38 0, // origin_pid |
39 0, // request_id | 39 0, // request_id |
40 resource_type == ResourceType::MAIN_FRAME, // is_main_frame | 40 resource_type == ResourceType::MAIN_FRAME, // is_main_frame |
41 0, // frame_id | 41 0, // frame_id |
42 false, // parent_is_main_frame | 42 false, // parent_is_main_frame |
43 0, // parent_frame_id | 43 0, // parent_frame_id |
44 resource_type, // resource_type | 44 resource_type, // resource_type |
45 PAGE_TRANSITION_LINK, // transition_type | 45 PAGE_TRANSITION_LINK, // transition_type |
46 false, // is_download | 46 false, // is_download |
47 false, // is_stream | 47 false, // is_stream |
| 48 false, // is_detachable |
48 true, // allow_download | 49 true, // allow_download |
49 false, // has_user_gesture | 50 false, // has_user_gesture |
50 WebKit::WebReferrerPolicyDefault, // referrer_policy | 51 WebKit::WebReferrerPolicyDefault, // referrer_policy |
51 context, // context | 52 context, // context |
52 base::WeakPtr<ResourceMessageFilter>(), // filter | 53 base::WeakPtr<ResourceMessageFilter>(), // filter |
53 is_async); // is_async | 54 is_async); // is_async |
54 info->AssociateWithRequest(request); | 55 info->AssociateWithRequest(request); |
55 } | 56 } |
56 | 57 |
57 // static | 58 // static |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 int origin_pid, | 91 int origin_pid, |
91 int request_id, | 92 int request_id, |
92 bool is_main_frame, | 93 bool is_main_frame, |
93 int64 frame_id, | 94 int64 frame_id, |
94 bool parent_is_main_frame, | 95 bool parent_is_main_frame, |
95 int64 parent_frame_id, | 96 int64 parent_frame_id, |
96 ResourceType::Type resource_type, | 97 ResourceType::Type resource_type, |
97 PageTransition transition_type, | 98 PageTransition transition_type, |
98 bool is_download, | 99 bool is_download, |
99 bool is_stream, | 100 bool is_stream, |
| 101 bool is_detachable, |
100 bool allow_download, | 102 bool allow_download, |
101 bool has_user_gesture, | 103 bool has_user_gesture, |
102 WebKit::WebReferrerPolicy referrer_policy, | 104 WebKit::WebReferrerPolicy referrer_policy, |
103 ResourceContext* context, | 105 ResourceContext* context, |
104 base::WeakPtr<ResourceMessageFilter> filter, | 106 base::WeakPtr<ResourceMessageFilter> filter, |
105 bool is_async) | 107 bool is_async) |
106 : cross_site_handler_(NULL), | 108 : cross_site_handler_(NULL), |
107 process_type_(process_type), | 109 process_type_(process_type), |
108 child_id_(child_id), | 110 child_id_(child_id), |
109 route_id_(route_id), | 111 route_id_(route_id), |
110 origin_pid_(origin_pid), | 112 origin_pid_(origin_pid), |
111 request_id_(request_id), | 113 request_id_(request_id), |
112 is_main_frame_(is_main_frame), | 114 is_main_frame_(is_main_frame), |
113 frame_id_(frame_id), | 115 frame_id_(frame_id), |
114 parent_is_main_frame_(parent_is_main_frame), | 116 parent_is_main_frame_(parent_is_main_frame), |
115 parent_frame_id_(parent_frame_id), | 117 parent_frame_id_(parent_frame_id), |
116 is_download_(is_download), | 118 is_download_(is_download), |
117 is_stream_(is_stream), | 119 is_stream_(is_stream), |
| 120 is_detachable_(is_detachable), |
| 121 is_detached_(false), |
118 allow_download_(allow_download), | 122 allow_download_(allow_download), |
119 has_user_gesture_(has_user_gesture), | 123 has_user_gesture_(has_user_gesture), |
120 was_ignored_by_handler_(false), | 124 was_ignored_by_handler_(false), |
121 resource_type_(resource_type), | 125 resource_type_(resource_type), |
122 transition_type_(transition_type), | 126 transition_type_(transition_type), |
123 memory_cost_(0), | 127 memory_cost_(0), |
124 referrer_policy_(referrer_policy), | 128 referrer_policy_(referrer_policy), |
125 context_(context), | 129 context_(context), |
126 filter_(filter), | 130 filter_(filter), |
127 is_async_(is_async) { | 131 is_async_(is_async) { |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 base::WeakPtr<ResourceMessageFilter> filter) { | 247 base::WeakPtr<ResourceMessageFilter> filter) { |
244 child_id_ = child_id; | 248 child_id_ = child_id; |
245 route_id_ = route_id; | 249 route_id_ = route_id; |
246 origin_pid_ = origin_pid; | 250 origin_pid_ = origin_pid; |
247 request_id_ = request_id; | 251 request_id_ = request_id; |
248 frame_id_ = frame_id; | 252 frame_id_ = frame_id; |
249 filter_ = filter; | 253 filter_ = filter; |
250 } | 254 } |
251 | 255 |
252 } // namespace content | 256 } // namespace content |
OLD | NEW |