Index: content/browser/frame_host/navigator_impl.h |
diff --git a/content/browser/frame_host/navigator_impl.h b/content/browser/frame_host/navigator_impl.h |
index 4b66876a7a0081adf613950633d62c02b2df986a..02f56809e6ca32c6f77dce71c8dcca160803f59c 100644 |
--- a/content/browser/frame_host/navigator_impl.h |
+++ b/content/browser/frame_host/navigator_impl.h |
@@ -10,6 +10,8 @@ |
#include "content/browser/frame_host/navigator.h" |
#include "content/common/content_export.h" |
+struct FrameMsg_Navigate_Params; |
+ |
namespace content { |
class NavigationControllerImpl; |
@@ -23,6 +25,13 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { |
NavigatorImpl(NavigationControllerImpl* navigation_controller, |
NavigatorDelegate* delegate); |
+ // Fills in |params| based on the content of |entry|. |
+ static void MakeNavigateParams(const NavigationEntryImpl& entry, |
+ const NavigationControllerImpl& controller, |
+ NavigationController::ReloadType reload_type, |
+ base::TimeTicks navigation_start, |
+ FrameMsg_Navigate_Params* params); |
+ |
// Navigator implementation. |
virtual NavigationController* GetController() OVERRIDE; |
virtual void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, |
@@ -67,6 +76,13 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { |
bool should_replace_current_entry, |
bool user_gesture) OVERRIDE; |
nasko
2014/08/13 00:08:00
nit: no new line needed
clamy
2014/08/13 13:27:24
Done.
|
+ virtual void OnBeginNavigation( |
+ RenderFrameHostImpl* render_frame_host, |
+ const FrameHostMsg_BeginNavigation_Params& params) OVERRIDE; |
+ virtual void CommitNavigation( |
+ RenderFrameHostImpl* render_frame_host, |
+ const NavigationBeforeCommitInfo& info) OVERRIDE; |
+ |
private: |
virtual ~NavigatorImpl() {} |
@@ -79,6 +95,10 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { |
bool ShouldAssignSiteForURL(const GURL& url); |
+ void CheckWebUIRendererDoesNotDisplayNormalURL( |
+ RenderFrameHostImpl* render_frame_host, |
+ const GURL& url); |
+ |
// The NavigationController that will keep track of session history for all |
// RenderFrameHost objects using this NavigatorImpl. |
// TODO(nasko): Move ownership of the NavigationController from |