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

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

Issue 1155713005: Use a resource throttle to implement shouldOverrideUrlLoading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add flag showing that shouldOverrideUrl cancelled the navigation Created 5 years, 6 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"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 235 }
236 236
237 if (delegate_) 237 if (delegate_)
238 delegate_->DidFailProvisionalLoadWithError(render_frame_host, params); 238 delegate_->DidFailProvisionalLoadWithError(render_frame_host, params);
239 } 239 }
240 240
241 void NavigatorImpl::DidFailLoadWithError( 241 void NavigatorImpl::DidFailLoadWithError(
242 RenderFrameHostImpl* render_frame_host, 242 RenderFrameHostImpl* render_frame_host,
243 const GURL& url, 243 const GURL& url,
244 int error_code, 244 int error_code,
245 const base::string16& error_description) { 245 const base::string16& error_description,
246 bool was_ignored_by_handler) {
246 if (delegate_) { 247 if (delegate_) {
247 delegate_->DidFailLoadWithError( 248 delegate_->DidFailLoadWithError(
248 render_frame_host, url, error_code, 249 render_frame_host, url, error_code,
249 error_description); 250 error_description, was_ignored_by_handler);
250 } 251 }
251 } 252 }
252 253
253 bool NavigatorImpl::NavigateToEntry( 254 bool NavigatorImpl::NavigateToEntry(
254 FrameTreeNode* frame_tree_node, 255 FrameTreeNode* frame_tree_node,
255 const NavigationEntryImpl& entry, 256 const NavigationEntryImpl& entry,
256 NavigationController::ReloadType reload_type) { 257 NavigationController::ReloadType reload_type) {
257 TRACE_EVENT0("browser,navigation", "NavigatorImpl::NavigateToEntry"); 258 TRACE_EVENT0("browser,navigation", "NavigatorImpl::NavigateToEntry");
258 259
259 // The renderer will reject IPC messages with URLs longer than 260 // The renderer will reject IPC messages with URLs longer than
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", 893 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
893 time_to_commit); 894 time_to_commit);
894 UMA_HISTOGRAM_TIMES( 895 UMA_HISTOGRAM_TIMES(
895 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", 896 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
896 time_to_network); 897 time_to_network);
897 } 898 }
898 navigation_data_.reset(); 899 navigation_data_.reset();
899 } 900 }
900 901
901 } // namespace content 902 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698