content: Instead of passing -1 around, use kNoFrameTreeNodeId
LoadURLParams, OpenURLParams, and NavigateParams have a
frame_tree_node_id member that corresponds to the frame that will be
navigated. Passing "-1" to these classes means that the navigation
would happen in the main frame. Using kNoFrameTreeNodeId makes the
meaning of -1 clearer for callers.
Change-Id: I08d653e36f52e170c67d00a34829aaa3de81db32
Reviewed-on: https://chromium-review.googlesource.com/897216
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Camille Lamy <[email protected]>
Commit-Queue: Giovanni Ortuño Urquidi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#536284}diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 8c028e41..f255e305 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -772,12 +772,13 @@
int frame_tree_node_id = params.frame_tree_node_id;
// navigation_ui_data should only be present for main frame navigations.
- DCHECK(frame_tree_node_id == -1 || !params.navigation_ui_data);
+ DCHECK(frame_tree_node_id == RenderFrameHost::kNoFrameTreeNodeId ||
+ !params.navigation_ui_data);
- // For subframes, create a pending entry with a corresponding frame entry.
- if (frame_tree_node_id != -1 || !params.frame_name.empty()) {
+ if (frame_tree_node_id != RenderFrameHost::kNoFrameTreeNodeId ||
+ !params.frame_name.empty()) {
FrameTreeNode* node =
- params.frame_tree_node_id != -1
+ params.frame_tree_node_id != RenderFrameHost::kNoFrameTreeNodeId
? delegate_->GetFrameTree()->FindByID(params.frame_tree_node_id)
: delegate_->GetFrameTree()->FindByName(params.frame_name);
if (node && !node->IsMainFrame()) {
