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

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

Issue 2655463006: PlzNavigate: Enforce 'frame-src' CSP on the browser. (Closed)
Patch Set: Add TODO in the FrameLoader. Created 3 years, 10 months 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 16 matching lines...) Expand all
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 std::vector<GURL>& redirect_chain, 33 const std::vector<GURL>& redirect_chain,
34 const base::TimeTicks& navigation_start) { 34 const base::TimeTicks& navigation_start) {
35 // The interstitial page should only navigate once. 35 // The interstitial page should only navigate once.
36 DCHECK(!render_frame_host->navigation_handle()); 36 DCHECK(!render_frame_host->navigation_handle());
37 render_frame_host->SetNavigationHandle( 37 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
38 NavigationHandleImpl::Create(url, redirect_chain, 38 url, redirect_chain, render_frame_host->frame_tree_node(),
39 render_frame_host->frame_tree_node(), 39 false, /* is_renderer_initiated */
40 false, // is_renderer_initiated 40 false, /* is_synchronous */
41 false, // is_synchronous 41 navigation_start, /* navigation_state */
42 navigation_start, 42 0, /* pending_nav_entry_id */
43 0, // pending_nav_entry_id 43 false, /* started_in_context_menu */
44 false) // started_in_context_menu 44 false /* should_bypass_main_world_csp */));
nasko 2017/02/15 21:28:44 nit: Align vertically the comment with the other c
arthursonzogni 2017/02/16 17:32:41 I can't because of the formatter. I don't know why
45 );
46 } 45 }
47 46
48 void InterstitialPageNavigatorImpl::DidNavigate( 47 void InterstitialPageNavigatorImpl::DidNavigate(
49 RenderFrameHostImpl* render_frame_host, 48 RenderFrameHostImpl* render_frame_host,
50 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, 49 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params,
51 std::unique_ptr<NavigationHandleImpl> navigation_handle) { 50 std::unique_ptr<NavigationHandleImpl> navigation_handle) {
52 navigation_handle->DidCommitNavigation( 51 navigation_handle->DidCommitNavigation(
53 input_params, false, GURL(), NAVIGATION_TYPE_NEW_PAGE, render_frame_host); 52 input_params, false, GURL(), NAVIGATION_TYPE_NEW_PAGE, render_frame_host);
54 navigation_handle.reset(); 53 navigation_handle.reset();
55 54
56 // TODO(nasko): Move implementation here, but for the time being call out 55 // TODO(nasko): Move implementation here, but for the time being call out
57 // to the interstitial page code. 56 // to the interstitial page code.
58 interstitial_->DidNavigate(render_frame_host->render_view_host(), 57 interstitial_->DidNavigate(render_frame_host->render_view_host(),
59 input_params); 58 input_params);
60 } 59 }
61 60
62 } // namespace content 61 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698