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

Unified Diff: chrome/renderer/net/net_error_helper.cc

Issue 1371673002: Remove a bunch of provisionalDataSource() usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: chrome/renderer/net/net_error_helper.cc
diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc
index 84f55e9b71686698220fdaaef1294e1ac5f4d42a..8a0ef97d555d04715599b56d7ade5e3f741a7d90 100644
--- a/chrome/renderer/net/net_error_helper.cc
+++ b/chrome/renderer/net/net_error_helper.cc
@@ -57,8 +57,9 @@ namespace {
// suggestions. If it takes too long, just use the local error page.
const int kNavigationCorrectionFetchTimeoutSec = 3;
-NetErrorHelperCore::PageType GetLoadingPageType(const blink::WebFrame* frame) {
- GURL url = frame->provisionalDataSource()->request().url();
+NetErrorHelperCore::PageType GetLoadingPageType(
+ const blink::WebDataSource* datasource) {
+ GURL url = datasource->request().url();
if (!url.is_valid() || url.spec() != kUnreachableWebDataURL)
return NetErrorHelperCore::NON_ERROR_PAGE;
return NetErrorHelperCore::ERROR_PAGE;
@@ -101,9 +102,9 @@ void NetErrorHelper::TrackClick(int tracking_id) {
core_->TrackClick(tracking_id);
}
-void NetErrorHelper::DidStartProvisionalLoad() {
+void NetErrorHelper::DidStartProvisionalLoad(blink::WebDataSource* datasource) {
blink::WebFrame* frame = render_frame()->GetWebFrame();
- core_->OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame));
+ core_->OnStartLoad(GetFrameType(frame), GetLoadingPageType(datasource));
}
void NetErrorHelper::DidCommitProvisionalLoad(bool is_new_navigation,
« no previous file with comments | « chrome/renderer/net/net_error_helper.h ('k') | components/autofill/content/renderer/password_autofill_agent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698