Add frame_tree_node_id to navigation parameters.

content/public/browser/page_navigator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // PageNavigator defines an interface that can be used to express the user's
 // intention to navigate to a particular URL.  The implementing class should
 // perform the navigation.
 
 #ifndef CONTENT_PUBLIC_BROWSER_PAGE_NAVIGATOR_H_
 #define CONTENT_PUBLIC_BROWSER_PAGE_NAVIGATOR_H_
@@ skipping 14 matching lines @@
 class WebContents;
 
 struct CONTENT_EXPORT OpenURLParams {
   OpenURLParams(const GURL& url,
                 const Referrer& referrer,
                 WindowOpenDisposition disposition,
                 PageTransition transition,
                 bool is_renderer_initiated);
   OpenURLParams(const GURL& url,
                 const Referrer& referrer,
                 int64 source_frame_id,

[nasko, 2013/11/20 18:01:30]

nit: TODO to remove this?

[Charlie Reis, 2013/11/20 21:43:06]

Wow.  I expected source_frame_id to be needed for something like the Web
Navigation API (etc), but it appears to be dead code.  We pass it in from
WebContents but forget it in browser_navigator.cc.

Before removing it, I want to do some digging to see how much can be removed and
why it was there in the first place, so I've added a TODO.

+                int64 frame_tree_node_id,
                 WindowOpenDisposition disposition,
                 PageTransition transition,
                 bool is_renderer_initiated);
   ~OpenURLParams();
 
   // The URL/referrer to be opened.
   GURL url;
   Referrer referrer;
 
   // Any redirect URLs that occurred for this navigation before |url|.
   std::vector<GURL> redirect_chain;
 
   // Indicates whether this navigation will be sent using POST.
   // The POST method is limited support for basic POST data by leveraging
   // NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST.
   // It is not for things like file uploads.
   bool uses_post;
 
   // The post data when the navigation uses POST.
   scoped_refptr<base::RefCountedMemory> browser_initiated_post_data;
 
   // Extra headers to add to the request for this page.  Headers are
   // represented as "<name>: <value>" and separated by \r\n.  The entire string
   // is terminated by \r\n.  May be empty if no extra headers are needed.
   std::string extra_headers;
 
-  // The source frame id or -1 to indicate the main frame.
+  // The renderer-specific source frame id or -1 to indicate the main frame.
   int64 source_frame_id;
 
+  // The browser-global FrameTreeNode ID or -1 to indicate the main frame.
+  int64 frame_tree_node_id;
+
   // The disposition requested by the navigation source.
   WindowOpenDisposition disposition;
 
   // The transition type of navigation.
   PageTransition transition;
 
   // Whether this navigation is initiated by the renderer process.
   bool is_renderer_initiated;
 
   // Reference to the old request id in case this is a navigation that is being
@@ skipping 19 matching lines @@
   // Opens a URL with the given disposition.  The transition specifies how this
   // navigation should be recorded in the history system (for example, typed).
   // Returns the WebContents the URL is opened in, or NULL if the URL wasn't
   // opened immediately.
   virtual WebContents* OpenURL(const OpenURLParams& params) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_PAGE_NAVIGATOR_H_