Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Side by Side Diff: content/browser/frame_host/interstitial_page_navigator_impl.cc

Issue 2557233002: Revert of Set user_gesture bit at NavigationHandle creation time. (Closed)
Patch Set: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/interstitial_page_navigator_impl.h" 5 #include "content/browser/frame_host/interstitial_page_navigator_impl.h"
6 6
7 #include "content/browser/frame_host/interstitial_page_impl.h" 7 #include "content/browser/frame_host/interstitial_page_impl.h"
8 #include "content/browser/frame_host/navigation_controller_impl.h" 8 #include "content/browser/frame_host/navigation_controller_impl.h"
9 #include "content/browser/frame_host/navigator_delegate.h" 9 #include "content/browser/frame_host/navigator_delegate.h"
10 #include "content/browser/renderer_host/render_view_host_impl.h" 10 #include "content/browser/renderer_host/render_view_host_impl.h"
(...skipping 12 matching lines...) Expand all
23 return interstitial_; 23 return interstitial_;
24 } 24 }
25 25
26 NavigationController* InterstitialPageNavigatorImpl::GetController() { 26 NavigationController* InterstitialPageNavigatorImpl::GetController() {
27 return controller_; 27 return controller_;
28 } 28 }
29 29
30 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad( 30 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad(
31 RenderFrameHostImpl* render_frame_host, 31 RenderFrameHostImpl* render_frame_host,
32 const GURL& url, 32 const GURL& url,
33 const base::TimeTicks& navigation_start, 33 const base::TimeTicks& navigation_start) {
34 NavigationGesture gesture) {
35 // The interstitial page should only navigate once. 34 // The interstitial page should only navigate once.
36 DCHECK(!render_frame_host->navigation_handle()); 35 DCHECK(!render_frame_host->navigation_handle());
37 render_frame_host->SetNavigationHandle( 36 render_frame_host->SetNavigationHandle(
38 NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(), 37 NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(),
39 false, // is_renderer_initiated 38 false, // is_renderer_initiated
40 false, // is_synchronous 39 false, // is_synchronous
41 navigation_start, 40 navigation_start,
42 0, // pending_nav_entry_id 41 0, // pending_nav_entry_id
43 gesture,
44 false) // started_in_context_menu 42 false) // started_in_context_menu
45 ); 43 );
46 } 44 }
47 45
48 void InterstitialPageNavigatorImpl::DidNavigate( 46 void InterstitialPageNavigatorImpl::DidNavigate(
49 RenderFrameHostImpl* render_frame_host, 47 RenderFrameHostImpl* render_frame_host,
50 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, 48 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params,
51 std::unique_ptr<NavigationHandleImpl> navigation_handle) { 49 std::unique_ptr<NavigationHandleImpl> navigation_handle) {
52 navigation_handle->DidCommitNavigation(input_params, false, 50 navigation_handle->DidCommitNavigation(input_params, false,
53 render_frame_host); 51 render_frame_host);
54 navigation_handle.reset(); 52 navigation_handle.reset();
55 53
56 // TODO(nasko): Move implementation here, but for the time being call out 54 // TODO(nasko): Move implementation here, but for the time being call out
57 // to the interstitial page code. 55 // to the interstitial page code.
58 interstitial_->DidNavigate(render_frame_host->render_view_host(), 56 interstitial_->DidNavigate(render_frame_host->render_view_host(),
59 input_params); 57 input_params);
60 } 58 }
61 59
62 } // namespace content 60 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698