OOPIF: History navigations for new child frames.

content/browser/frame_host/navigator_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 38 matching lines @@
                             int error_code,
                             const base::string16& error_description,
                             bool was_ignored_by_handler) override;
   void DidNavigate(
       RenderFrameHostImpl* render_frame_host,
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params) override;
   bool NavigateToPendingEntry(FrameTreeNode* frame_tree_node,
                               const FrameNavigationEntry& frame_entry,
                               NavigationController::ReloadType reload_type,
                               bool is_same_document_history_load) override;
+  bool NavigateNewChildFrame(RenderFrameHostImpl* render_frame_host,
+                             const std::string& unique_name) override;
   void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
                       const GURL& url,
                       SiteInstance* source_site_instance,
                       const Referrer& referrer,
                       WindowOpenDisposition disposition,
                       bool should_replace_current_entry,
                       bool user_gesture) override;
   void RequestTransferURL(RenderFrameHostImpl* render_frame_host,
                           const GURL& url,
                           SiteInstance* source_site_instance,
@@ skipping 22 matching lines @@
       const base::TimeTicks& renderer_before_unload_end_time) override;
   void CancelNavigation(FrameTreeNode* frame_tree_node) override;
 
  private:
   // Holds data used to track browser side navigation metrics.
   struct NavigationMetricsData;
 
   friend class NavigatorTestWithBrowserSideNavigation;
   ~NavigatorImpl() override;
 
-  // Navigates to the given entry, which must be the pending entry.  Private
-  // because all callers should use NavigateToPendingEntry.
+  // Navigates to the given entry, which might be the pending entry (if
+  // |is_pending_entry| is true).  Private because all callers should use either
+  // NavigateToPendingEntry or NavigateToNewChildFrame.
   bool NavigateToEntry(FrameTreeNode* frame_tree_node,
                        const FrameNavigationEntry& frame_entry,
                        const NavigationEntryImpl& entry,
                        NavigationController::ReloadType reload_type,
-                       bool is_same_document_history_load);
+                       bool is_same_document_history_load,
+                       bool is_pending_entry);
 
   bool ShouldAssignSiteForURL(const GURL& url);
 
   void CheckWebUIRendererDoesNotDisplayNormalURL(
     RenderFrameHostImpl* render_frame_host,
     const GURL& url);
 
   // PlzNavigate: if needed, sends a BeforeUnload IPC to the renderer to ask it
   // to execute the beforeUnload event. Otherwise, the navigation request will
   // be started.
@@ skipping 28 matching lines @@
   NavigatorDelegate* delegate_;
 
   scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_