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

Side by Side 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: Rebase 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 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/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
11 #include "content/browser/frame_host/frame_tree_node.h" 11 #include "content/browser/frame_host/frame_tree_node.h"
12 #include "content/browser/frame_host/navigation_controller_impl.h" 12 #include "content/browser/frame_host/navigation_controller_impl.h"
13 #include "content/browser/frame_host/navigation_entry_impl.h" 13 #include "content/browser/frame_host/navigation_entry_impl.h"
14 #include "content/browser/frame_host/navigation_handle_factory.h"
14 #include "content/browser/frame_host/navigation_handle_impl.h" 15 #include "content/browser/frame_host/navigation_handle_impl.h"
15 #include "content/browser/frame_host/navigation_request.h" 16 #include "content/browser/frame_host/navigation_request.h"
16 #include "content/browser/frame_host/navigation_request_info.h" 17 #include "content/browser/frame_host/navigation_request_info.h"
17 #include "content/browser/frame_host/navigator_delegate.h" 18 #include "content/browser/frame_host/navigator_delegate.h"
18 #include "content/browser/frame_host/render_frame_host_impl.h" 19 #include "content/browser/frame_host/render_frame_host_impl.h"
19 #include "content/browser/renderer_host/render_view_host_impl.h" 20 #include "content/browser/renderer_host/render_view_host_impl.h"
20 #include "content/browser/site_instance_impl.h" 21 #include "content/browser/site_instance_impl.h"
21 #include "content/browser/webui/web_ui_controller_factory_registry.h" 22 #include "content/browser/webui/web_ui_controller_factory_registry.h"
22 #include "content/browser/webui/web_ui_impl.h" 23 #include "content/browser/webui/web_ui_impl.h"
23 #include "content/common/frame_messages.h" 24 #include "content/common/frame_messages.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 render_frame_host->navigation_handle()->set_is_transferring(false); 152 render_frame_host->navigation_handle()->set_is_transferring(false);
152 return; 153 return;
153 } 154 }
154 155
155 // This ensures that notifications about the end of the previous 156 // This ensures that notifications about the end of the previous
156 // navigation are sent before notifications about the start of the 157 // navigation are sent before notifications about the start of the
157 // new navigation. 158 // new navigation.
158 render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>()); 159 render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>());
159 } 160 }
160 161
161 render_frame_host->SetNavigationHandle( 162 GURL filtered_url = url;
162 NavigationHandleImpl::Create(url, is_main_frame, delegate_)); 163 render_frame_host->GetProcess()->FilterURL(false, &filtered_url);
Charlie Reis 2015/09/16 00:09:25 Again, I'm not sure this is the right place to be
clamy 2015/09/16 01:03:22 This was removed since we already call FilterURL a
164 render_frame_host->SetNavigationHandle(NavigationHandleFactory::Create(
165 url, filtered_url, is_main_frame, delegate_));
163 } 166 }
164 167
165 void NavigatorImpl::DidFailProvisionalLoadWithError( 168 void NavigatorImpl::DidFailProvisionalLoadWithError(
166 RenderFrameHostImpl* render_frame_host, 169 RenderFrameHostImpl* render_frame_host,
167 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 170 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
168 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() 171 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
169 << ", error_code: " << params.error_code 172 << ", error_code: " << params.error_code
170 << ", error_description: " << params.error_description 173 << ", error_description: " << params.error_description
171 << ", showing_repost_interstitial: " << 174 << ", showing_repost_interstitial: " <<
172 params.showing_repost_interstitial 175 params.showing_repost_interstitial
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 entry->set_should_replace_entry(pending_entry->should_replace_entry()); 946 entry->set_should_replace_entry(pending_entry->should_replace_entry());
944 entry->SetRedirectChain(pending_entry->GetRedirectChain()); 947 entry->SetRedirectChain(pending_entry->GetRedirectChain());
945 } 948 }
946 controller_->SetPendingEntry(entry.Pass()); 949 controller_->SetPendingEntry(entry.Pass());
947 if (delegate_) 950 if (delegate_)
948 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 951 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
949 } 952 }
950 } 953 }
951 954
952 } // namespace content 955 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698