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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 request.SetHTTPReferrer(web_referrer, common_params.referrer.policy); | 468 request.SetHTTPReferrer(web_referrer, common_params.referrer.policy); |
469 request.AddHTTPOriginIfNeeded( | 469 request.AddHTTPOriginIfNeeded( |
470 WebSecurityOrigin(url::Origin(common_params.referrer.url))); | 470 WebSecurityOrigin(url::Origin(common_params.referrer.url))); |
471 } | 471 } |
472 } | 472 } |
473 | 473 |
474 request.SetIsSameDocumentNavigation(is_same_document_navigation); | 474 request.SetIsSameDocumentNavigation(is_same_document_navigation); |
475 request.SetPreviewsState( | 475 request.SetPreviewsState( |
476 static_cast<WebURLRequest::PreviewsState>(common_params.previews_state)); | 476 static_cast<WebURLRequest::PreviewsState>(common_params.previews_state)); |
477 | 477 |
| 478 request.SetBrowserGeneratedRequestId(request_params.devtools_request_id); |
| 479 |
478 RequestExtraData* extra_data = new RequestExtraData(); | 480 RequestExtraData* extra_data = new RequestExtraData(); |
479 extra_data->set_stream_override(std::move(stream_override)); | 481 extra_data->set_stream_override(std::move(stream_override)); |
480 extra_data->set_navigation_initiated_by_renderer( | 482 extra_data->set_navigation_initiated_by_renderer( |
481 request_params.nav_entry_id == 0); | 483 request_params.nav_entry_id == 0); |
482 request.SetExtraData(extra_data); | 484 request.SetExtraData(extra_data); |
483 | 485 |
484 // Set the ui timestamp for this navigation. Currently the timestamp here is | 486 // Set the ui timestamp for this navigation. Currently the timestamp here is |
485 // only non empty when the navigation was triggered by an Android intent. The | 487 // only non empty when the navigation was triggered by an Android intent. The |
486 // timestamp is converted to a double version supported by blink. It will be | 488 // timestamp is converted to a double version supported by blink. It will be |
487 // passed back to the browser in the DidCommitProvisionalLoad and the | 489 // passed back to the browser in the DidCommitProvisionalLoad and the |
(...skipping 6487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6975 policy(info.default_policy), | 6977 policy(info.default_policy), |
6976 replaces_current_history_item(info.replaces_current_history_item), | 6978 replaces_current_history_item(info.replaces_current_history_item), |
6977 history_navigation_in_new_child_frame( | 6979 history_navigation_in_new_child_frame( |
6978 info.is_history_navigation_in_new_child_frame), | 6980 info.is_history_navigation_in_new_child_frame), |
6979 client_redirect(info.is_client_redirect), | 6981 client_redirect(info.is_client_redirect), |
6980 cache_disabled(info.is_cache_disabled), | 6982 cache_disabled(info.is_cache_disabled), |
6981 form(info.form), | 6983 form(info.form), |
6982 source_location(info.source_location) {} | 6984 source_location(info.source_location) {} |
6983 | 6985 |
6984 } // namespace content | 6986 } // namespace content |
OLD | NEW |