content/browser/frame_host/navigator_impl.cc - Issue 1269813002: Add a NavigationThrottle to the public content/ interface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 1269813002: Add a NavigationThrottle to the public content/ interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation-api

Patch Set: Addressed comments Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/navigation_handle_impl.cc ('K') | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl.cc

diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc

index b2be362dfb61d9b6904098078d4c62f5f2c1cbc6..ab998deac81aa875502684ec32b0db9e95baa944 100644

--- a/content/browser/frame_host/navigator_impl.cc

+++ b/content/browser/frame_host/navigator_impl.cc

@@ -11,6 +11,7 @@

#include "content/browser/frame_host/frame_tree_node.h"

#include "content/browser/frame_host/navigation_controller_impl.h"

#include "content/browser/frame_host/navigation_entry_impl.h"

+#include "content/browser/frame_host/navigation_handle_factory.h"

#include "content/browser/frame_host/navigation_handle_impl.h"

#include "content/browser/frame_host/navigation_request.h"

#include "content/browser/frame_host/navigation_request_info.h"

@@ -158,8 +159,10 @@ void NavigatorImpl::DidStartProvisionalLoad(

render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>());

}

- render_frame_host->SetNavigationHandle(

- NavigationHandleImpl::Create(url, is_main_frame, delegate_));

+ GURL filtered_url = url;

+ render_frame_host->GetProcess()->FilterURL(false, &filtered_url);

+ render_frame_host->SetNavigationHandle(NavigationHandleFactory::Create(

+ url, filtered_url, is_main_frame, delegate_));

}

void NavigatorImpl::DidFailProvisionalLoadWithError(