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/browser/frame_host/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 frame_tree->root()->render_manager()->DidNavigateFrame( | 511 frame_tree->root()->render_manager()->DidNavigateFrame( |
512 render_frame_host, params.gesture == NavigationGestureUser); | 512 render_frame_host, params.gesture == NavigationGestureUser); |
513 } | 513 } |
514 | 514 |
515 // Save the origin of the new page. Do this before calling | 515 // Save the origin of the new page. Do this before calling |
516 // DidNavigateFrame(), because the origin needs to be included in the SwapOut | 516 // DidNavigateFrame(), because the origin needs to be included in the SwapOut |
517 // message, which is sent inside DidNavigateFrame(). SwapOut needs the | 517 // message, which is sent inside DidNavigateFrame(). SwapOut needs the |
518 // origin because it creates a RenderFrameProxy that needs this to initialize | 518 // origin because it creates a RenderFrameProxy that needs this to initialize |
519 // its security context. This origin will also be sent to RenderFrameProxies | 519 // its security context. This origin will also be sent to RenderFrameProxies |
520 // created via ViewMsg_New and FrameMsg_NewFrameProxy. | 520 // created via ViewMsg_New and FrameMsg_NewFrameProxy. |
521 render_frame_host->frame_tree_node()->SetCurrentOrigin(params.origin); | 521 render_frame_host->frame_tree_node()->SetCurrentOrigin( |
| 522 params.origin, params.has_potentially_trustworthy_unique_origin); |
522 | 523 |
523 render_frame_host->frame_tree_node()->SetEnforceStrictMixedContentChecking( | 524 render_frame_host->frame_tree_node()->SetEnforceStrictMixedContentChecking( |
524 params.should_enforce_strict_mixed_content_checking); | 525 params.should_enforce_strict_mixed_content_checking); |
525 | 526 |
526 // When using --site-per-process, we notify the RFHM for all navigations, | 527 // When using --site-per-process, we notify the RFHM for all navigations, |
527 // not just main frame navigations. | 528 // not just main frame navigations. |
528 if (oopifs_possible) { | 529 if (oopifs_possible) { |
529 FrameTreeNode* frame = render_frame_host->frame_tree_node(); | 530 FrameTreeNode* frame = render_frame_host->frame_tree_node(); |
530 frame->render_manager()->DidNavigateFrame( | 531 frame->render_manager()->DidNavigateFrame( |
531 render_frame_host, params.gesture == NavigationGestureUser); | 532 render_frame_host, params.gesture == NavigationGestureUser); |
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1115 entry->set_should_replace_entry(pending_entry->should_replace_entry()); | 1116 entry->set_should_replace_entry(pending_entry->should_replace_entry()); |
1116 entry->SetRedirectChain(pending_entry->GetRedirectChain()); | 1117 entry->SetRedirectChain(pending_entry->GetRedirectChain()); |
1117 } | 1118 } |
1118 controller_->SetPendingEntry(std::move(entry)); | 1119 controller_->SetPendingEntry(std::move(entry)); |
1119 if (delegate_) | 1120 if (delegate_) |
1120 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1121 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
1121 } | 1122 } |
1122 } | 1123 } |
1123 | 1124 |
1124 } // namespace content | 1125 } // namespace content |
OLD | NEW |