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

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nasko comments Created 5 years 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 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 } 454 }
455 455
456 // Save the origin of the new page. Do this before calling 456 // Save the origin of the new page. Do this before calling
457 // DidNavigateFrame(), because the origin needs to be included in the SwapOut 457 // DidNavigateFrame(), because the origin needs to be included in the SwapOut
458 // message, which is sent inside DidNavigateFrame(). SwapOut needs the 458 // message, which is sent inside DidNavigateFrame(). SwapOut needs the
459 // origin because it creates a RenderFrameProxy that needs this to initialize 459 // origin because it creates a RenderFrameProxy that needs this to initialize
460 // its security context. This origin will also be sent to RenderFrameProxies 460 // its security context. This origin will also be sent to RenderFrameProxies
461 // created via ViewMsg_New and FrameMsg_NewFrameProxy. 461 // created via ViewMsg_New and FrameMsg_NewFrameProxy.
462 render_frame_host->frame_tree_node()->SetCurrentOrigin(params.origin); 462 render_frame_host->frame_tree_node()->SetCurrentOrigin(params.origin);
463 463
464 render_frame_host->frame_tree_node()->SetEnforceStrictMixedContentChecking(
465 params.should_enforce_strict_mixed_content_checking);
466
464 // When using --site-per-process, we notify the RFHM for all navigations, 467 // When using --site-per-process, we notify the RFHM for all navigations,
465 // not just main frame navigations. 468 // not just main frame navigations.
466 if (oopifs_possible) { 469 if (oopifs_possible) {
467 FrameTreeNode* frame = render_frame_host->frame_tree_node(); 470 FrameTreeNode* frame = render_frame_host->frame_tree_node();
468 frame->render_manager()->DidNavigateFrame( 471 frame->render_manager()->DidNavigateFrame(
469 render_frame_host, params.gesture == NavigationGestureUser); 472 render_frame_host, params.gesture == NavigationGestureUser);
470 } 473 }
471 474
472 // Update the site of the SiteInstance if it doesn't have one yet, unless 475 // Update the site of the SiteInstance if it doesn't have one yet, unless
473 // assigning a site is not necessary for this URL. In that case, the 476 // assigning a site is not necessary for this URL. In that case, the
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 entry->set_should_replace_entry(pending_entry->should_replace_entry()); 987 entry->set_should_replace_entry(pending_entry->should_replace_entry());
985 entry->SetRedirectChain(pending_entry->GetRedirectChain()); 988 entry->SetRedirectChain(pending_entry->GetRedirectChain());
986 } 989 }
987 controller_->SetPendingEntry(entry.Pass()); 990 controller_->SetPendingEntry(entry.Pass());
988 if (delegate_) 991 if (delegate_)
989 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 992 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
990 } 993 }
991 } 994 }
992 995
993 } // namespace content 996 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698