| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 6f22bef294fbe13a5ff89c72fb0c66fa1e0b8a24..94746c9304a060ff4281b175476b331e7c3aa881 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -1108,14 +1108,15 @@ void RenderFrameHostImpl::OnDocumentOnLoadCompleted(
|
|
|
| void RenderFrameHostImpl::OnDidStartProvisionalLoad(
|
| const GURL& url,
|
| - const base::TimeTicks& navigation_start) {
|
| + const base::TimeTicks& navigation_start,
|
| + NavigationGesture gesture) {
|
| // TODO(clamy): Check if other navigation methods (OpenURL,
|
| // DidFailProvisionalLoad, ...) should also be ignored if the RFH is no longer
|
| // active.
|
| if (!is_active())
|
| return;
|
| - frame_tree_node_->navigator()->DidStartProvisionalLoad(this, url,
|
| - navigation_start);
|
| + frame_tree_node_->navigator()->DidStartProvisionalLoad(
|
| + this, url, navigation_start, gesture);
|
| }
|
|
|
| void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
|
| @@ -2424,9 +2425,9 @@ void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) {
|
| DCHECK(data_url.SchemeIs(url::kDataScheme));
|
| CommonNavigationParams common_params(
|
| data_url, Referrer(), ui::PAGE_TRANSITION_LINK,
|
| - FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(),
|
| - FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), LOFI_OFF,
|
| - base::TimeTicks::Now(), "GET", nullptr);
|
| + FrameMsg_Navigate_Type::NORMAL, NavigationGestureAuto, false, false,
|
| + base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT,
|
| + GURL(), GURL(), LOFI_OFF, base::TimeTicks::Now(), "GET", nullptr);
|
| if (IsBrowserSideNavigationEnabled()) {
|
| CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(),
|
| false);
|
| @@ -3282,7 +3283,8 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
|
| return NavigationHandleImpl::Create(
|
| params.url, frame_tree_node_, is_renderer_initiated,
|
| params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(),
|
| - pending_nav_entry_id, false); // started_from_context_menu
|
| + pending_nav_entry_id, params.gesture,
|
| + false); // started_from_context_menu
|
| }
|
|
|
| // Determine if the current NavigationHandle can be used.
|
| @@ -3334,7 +3336,8 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
|
| return NavigationHandleImpl::Create(
|
| params.url, frame_tree_node_, is_renderer_initiated,
|
| params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(),
|
| - entry_id_for_data_nav, false); // started_from_context_menu
|
| + entry_id_for_data_nav, params.gesture,
|
| + false); // started_from_context_menu
|
| }
|
|
|
| } // namespace content
|
|
|