| 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..b461ae05cc6e2630c26f9e11cc7f51f854d2961a 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,
|
| @@ -66,6 +75,9 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator {
|
| const GlobalRequestID& transferred_global_request_id,
|
| bool should_replace_current_entry,
|
| bool user_gesture) OVERRIDE;
|
| + virtual void CommitNavigation(
|
| + RenderFrameHostImpl* render_frame_host,
|
| + const NavigationBeforeCommitInfo& info) OVERRIDE;
|
|
|
| private:
|
| virtual ~NavigatorImpl() {}
|
| @@ -79,6 +91,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
|
|
|