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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10316020: Remove WebContentsImpl::OnDidRedirectProvisionalLoad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Also fix unit test that referenced ViewHostMsg_DidRedirectProvisionalLoad Created 8 years, 8 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 05dafcd5a03c47149959973c9ea7ad5ec9ee9b18..c1e66e45a71d9f1bdac4c73f34d63bacf831e313 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -566,8 +566,6 @@ bool WebContentsImpl::OnMessageReceived(const IPC::Message& message) {
OnWebIntentDispatch)
IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame,
OnDidStartProvisionalLoadForFrame)
- IPC_MESSAGE_HANDLER(ViewHostMsg_DidRedirectProvisionalLoad,
- OnDidRedirectProvisionalLoad)
IPC_MESSAGE_HANDLER(ViewHostMsg_DidFailProvisionalLoadWithError,
OnDidFailProvisionalLoadWithError)
IPC_MESSAGE_HANDLER(ViewHostMsg_DidLoadResourceFromMemoryCache,
@@ -1518,45 +1516,6 @@ void WebContentsImpl::OnDidStartProvisionalLoadForFrame(int64 frame_id,
}
}
-void WebContentsImpl::OnDidRedirectProvisionalLoad(int32 page_id,
- const GURL& opener_url,
- const GURL& source_url,
- const GURL& target_url) {
- // TODO(creis): Remove this method and have the pre-rendering code listen to
- // the ResourceDispatcherHost's RESOURCE_RECEIVED_REDIRECT notification
- // instead. See http://crbug.com/78512.
- GURL validated_source_url(source_url);
- GURL validated_target_url(target_url);
- GURL validated_opener_url(opener_url);
- GetRenderViewHostImpl()->FilterURL(
- ChildProcessSecurityPolicyImpl::GetInstance(),
- GetRenderProcessHost()->GetID(),
- false,
- &validated_source_url);
- GetRenderViewHostImpl()->FilterURL(
- ChildProcessSecurityPolicyImpl::GetInstance(),
- GetRenderProcessHost()->GetID(),
- false,
- &validated_target_url);
- GetRenderViewHostImpl()->FilterURL(
- ChildProcessSecurityPolicyImpl::GetInstance(),
- GetRenderProcessHost()->GetID(),
- true,
- &validated_opener_url);
- NavigationEntry* entry;
- if (page_id == -1)
- entry = controller_.GetPendingEntry();
- else
- entry = controller_.GetEntryWithPageID(GetSiteInstance(), page_id);
- if (!entry || entry->GetURL() != validated_source_url)
- return;
-
- // Notify observers about the provisional change in the main frame URL.
- FOR_EACH_OBSERVER(WebContentsObserver, observers_,
- ProvisionalChangeToMainFrameUrl(validated_target_url,
cbentzel 2012/05/08 04:29:09 You should remove ProvisionalChangeToMainFrameUrl
- validated_opener_url));
-}
-
void WebContentsImpl::OnDidFailProvisionalLoadWithError(
const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params) {
VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698