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

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

Issue 2534393003: (Reland) Remove about:srcdoc url conversion. (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 20 matching lines...) Expand all
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) { 34 NavigationGesture gesture) {
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(
38 NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(), 38 NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(),
39 false, // is_renderer_initiated 39 false, // is_renderer_initiated
40 false, // is_synchronous 40 false, // is_synchronous
41 false, // is_srcdoc
42 navigation_start, 41 navigation_start,
43 0, // pending_nav_entry_id 42 0, // pending_nav_entry_id
44 gesture, 43 gesture,
45 false) // started_in_context_menu 44 false) // started_in_context_menu
46 ); 45 );
47 } 46 }
48 47
49 void InterstitialPageNavigatorImpl::DidNavigate( 48 void InterstitialPageNavigatorImpl::DidNavigate(
50 RenderFrameHostImpl* render_frame_host, 49 RenderFrameHostImpl* render_frame_host,
51 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, 50 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params,
52 std::unique_ptr<NavigationHandleImpl> navigation_handle) { 51 std::unique_ptr<NavigationHandleImpl> navigation_handle) {
53 navigation_handle->DidCommitNavigation(input_params, false, 52 navigation_handle->DidCommitNavigation(input_params, false,
54 render_frame_host); 53 render_frame_host);
55 navigation_handle.reset(); 54 navigation_handle.reset();
56 55
57 // TODO(nasko): Move implementation here, but for the time being call out 56 // TODO(nasko): Move implementation here, but for the time being call out
58 // to the interstitial page code. 57 // to the interstitial page code.
59 interstitial_->DidNavigate(render_frame_host->render_view_host(), 58 interstitial_->DidNavigate(render_frame_host->render_view_host(),
60 input_params); 59 input_params);
61 } 60 }
62 61
63 } // namespace content 62 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698