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

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: Fix botched rebase Created 8 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 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 7fbe84367e0269803aed8ddbca713c9099720eda..e470c5c880dbdb7b4293e947082aeedc01fbd681 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1793,60 +1793,6 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(
FOR_EACH_OBSERVER(WebContentsObserver, observers_,
DidStartProvisionalLoadForFrame(frame_id, is_main_frame,
validated_url, is_error_page, render_view_host));
-
- if (is_main_frame) {
- // Notify observers about the provisional change in the main frame URL.
- FOR_EACH_OBSERVER(WebContentsObserver, observers_,
- ProvisionalChangeToMainFrameUrl(validated_url,
- validated_opener_url,
- render_view_host));
- }
-}
-
-void WebContentsImpl::DidRedirectProvisionalLoad(
- content::RenderViewHost* render_view_host,
- 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);
- content::RenderProcessHost* render_process_host =
- render_view_host->GetProcess();
- RenderViewHostImpl::FilterURL(
- ChildProcessSecurityPolicyImpl::GetInstance(),
- render_process_host->GetID(),
- false,
- &validated_source_url);
- RenderViewHostImpl::FilterURL(
- ChildProcessSecurityPolicyImpl::GetInstance(),
- render_process_host->GetID(),
- false,
- &validated_target_url);
- RenderViewHostImpl::FilterURL(
- ChildProcessSecurityPolicyImpl::GetInstance(),
- render_process_host->GetID(),
- true,
- &validated_opener_url);
- NavigationEntry* entry;
- if (page_id == -1) {
- entry = controller_.GetPendingEntry();
- } else {
- entry = controller_.GetEntryWithPageID(render_view_host->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,
- validated_opener_url,
- render_view_host));
}
void WebContentsImpl::DidFailProvisionalLoadWithError(
« 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