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

Unified Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 1104603002: Pick frame to navigate in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test cases Created 5 years, 8 months 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 01ab901fe7d5e6c5bc9b4752cdfc21728f030c2c..8c9f0332d62ca36934acfa1dd85c16691fa8e209 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -731,6 +731,13 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
params.is_renderer_initiated,
params.extra_headers,
browser_context_));
+ if (!params.frame_name.empty()) {
+ // This is only used for navigating subframes in tests.
+ FrameTreeNode* named_frame =
+ delegate_->GetFrameTree()->FindByName(params.frame_name);
+ if (named_frame)
+ entry->set_frame_tree_node_id(named_frame->frame_tree_node_id());
+ }
if (params.frame_tree_node_id != -1)
entry->set_frame_tree_node_id(params.frame_tree_node_id);
entry->set_source_site_instance(
@@ -745,7 +752,6 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
entry->SetIsOverridingUserAgent(override);
entry->set_transferred_global_request_id(
params.transferred_global_request_id);
- entry->SetFrameToNavigate(params.frame_name);
#if defined(OS_ANDROID)
if (params.intent_received_timestamp > 0) {
« no previous file with comments | « content/browser/frame_host/navigation_controller_delegate.h ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698