OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 request.setHTTPReferrer(web_referrer, common_params.referrer.policy); | 601 request.setHTTPReferrer(web_referrer, common_params.referrer.policy); |
602 request.addHTTPOriginIfNeeded( | 602 request.addHTTPOriginIfNeeded( |
603 WebSecurityOrigin(url::Origin(common_params.referrer.url))); | 603 WebSecurityOrigin(url::Origin(common_params.referrer.url))); |
604 } | 604 } |
605 } | 605 } |
606 | 606 |
607 request.setIsSameDocumentNavigation(is_same_document_navigation); | 607 request.setIsSameDocumentNavigation(is_same_document_navigation); |
608 request.setPreviewsState( | 608 request.setPreviewsState( |
609 static_cast<WebURLRequest::PreviewsState>(common_params.previews_state)); | 609 static_cast<WebURLRequest::PreviewsState>(common_params.previews_state)); |
610 | 610 |
| 611 request.setBrowserGeneratedRequestId(request_params.devtools_request_id); |
| 612 |
611 RequestExtraData* extra_data = new RequestExtraData(); | 613 RequestExtraData* extra_data = new RequestExtraData(); |
612 extra_data->set_stream_override(std::move(stream_override)); | 614 extra_data->set_stream_override(std::move(stream_override)); |
613 extra_data->set_navigation_initiated_by_renderer( | 615 extra_data->set_navigation_initiated_by_renderer( |
614 request_params.nav_entry_id == 0); | 616 request_params.nav_entry_id == 0); |
615 request.setExtraData(extra_data); | 617 request.setExtraData(extra_data); |
616 | 618 |
617 // Set the ui timestamp for this navigation. Currently the timestamp here is | 619 // Set the ui timestamp for this navigation. Currently the timestamp here is |
618 // only non empty when the navigation was triggered by an Android intent. The | 620 // only non empty when the navigation was triggered by an Android intent. The |
619 // timestamp is converted to a double version supported by blink. It will be | 621 // timestamp is converted to a double version supported by blink. It will be |
620 // passed back to the browser in the DidCommitProvisionalLoad and the | 622 // passed back to the browser in the DidCommitProvisionalLoad and the |
(...skipping 6348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6969 policy(info.defaultPolicy), | 6971 policy(info.defaultPolicy), |
6970 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6972 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6971 history_navigation_in_new_child_frame( | 6973 history_navigation_in_new_child_frame( |
6972 info.isHistoryNavigationInNewChildFrame), | 6974 info.isHistoryNavigationInNewChildFrame), |
6973 client_redirect(info.isClientRedirect), | 6975 client_redirect(info.isClientRedirect), |
6974 cache_disabled(info.isCacheDisabled), | 6976 cache_disabled(info.isCacheDisabled), |
6975 form(info.form), | 6977 form(info.form), |
6976 source_location(info.sourceLocation) {} | 6978 source_location(info.sourceLocation) {} |
6977 | 6979 |
6978 } // namespace content | 6980 } // namespace content |
OLD | NEW |