Move DidStartLoading, DidStopLoading, DidChangeLoadProgress to RFHI.

content/browser/frame_host/navigator.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_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
+#include "content/browser/frame_host/navigator_delegate.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_controller.h"
 #include "ui/base/window_open_disposition.h"
 
 class GURL;
 struct FrameHostMsg_BeginNavigation_Params;
 struct FrameHostMsg_DidCommitProvisionalLoad_Params;
 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params;
 
 namespace base {
 class TimeTicks;
 }
 
 namespace content {
 
 class FrameTreeNode;
 class NavigationControllerImpl;
 class NavigationEntryImpl;
 class NavigationRequest;
-class NavigatorDelegate;
 class RenderFrameHostImpl;
 class ResourceRequestBody;
 class StreamHandle;
 struct BeginNavigationParams;
 struct CommonNavigationParams;
 struct ResourceResponse;
 
 // Implementations of this interface are responsible for performing navigations
 // in a node of the FrameTree. Its lifetime is bound to all FrameTreeNode
 // objects that are using it and will be released once all nodes that use it are
@@ skipping 41 matching lines @@
   // If this method returns false, then the navigation is discarded (equivalent
   // to calling DiscardPendingEntry on the NavigationController).
   //
   // TODO(nasko): Remove this method from the interface, since Navigator and
   // NavigationController know about each other. This will be possible once
   // initialization of Navigator and NavigationController is properly done.
   virtual bool NavigateToPendingEntry(
       FrameTreeNode* frame_tree_node,
       NavigationController::ReloadType reload_type);
 
-
   // Navigation requests -------------------------------------------------------
 
   virtual base::TimeTicks GetCurrentLoadStart();
 
   // The RenderFrameHostImpl has received a request to open a URL with the
   // specified |disposition|.
   virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
                               const GURL& url,
                               SiteInstance* source_site_instance,
                               const Referrer& referrer,
@@ skipping 58 matching lines @@
   // current navigation.
   virtual void LogBeforeUnloadTime(
       const base::TimeTicks& renderer_before_unload_start_time,
       const base::TimeTicks& renderer_before_unload_end_time) {}
 
   // PlzNavigate
   // Returns whether there is an ongoing navigation waiting for the BeforeUnload
   // event to execute in the renderer process.
   virtual bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node);
 
+  // Returns the delegate of this Navigator.
+  virtual NavigatorDelegate* GetDelegate();

[nasko, 2015/04/15 19:17:05]

nit: I'd move this method right next to the GetController() one.

[Charlie Reis, 2015/04/15 23:37:53]

+1, and I'd put it before GetController.

[Fabrice (no longer in Chrome), 2015/04/16 13:55:25]

Done.

+
  protected:
   friend class base::RefCounted<Navigator>;
   virtual ~Navigator() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_