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

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 9030010: Move most of the remaining users of WebContentsObserver::tab_contents() to use web_contents(). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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/browser/prerender/prerender_contents.cc
===================================================================
--- chrome/browser/prerender/prerender_contents.cc (revision 115777)
+++ chrome/browser/prerender/prerender_contents.cc (working copy)
@@ -38,6 +38,7 @@
#endif
using content::DownloadItem;
+using content::WebContents;
namespace prerender {
@@ -330,7 +331,7 @@
// Register for redirect notifications sourced from |this|.
notification_registrar_.Add(
this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
- content::Source<RenderViewHostDelegate>(GetRenderViewHostDelegate()));
+ content::Source<WebContents>(GetWebContents()));
// Register for new windows from any source.
notification_registrar_.Add(
@@ -424,8 +425,7 @@
// to be remembered for future matching, and if it redirects to
// an https resource, it needs to be canceled. If a subresource
// is redirected, nothing changes.
- DCHECK(content::Source<RenderViewHostDelegate>(source).ptr() ==
- GetRenderViewHostDelegate());
+ DCHECK(content::Source<WebContents>(source).ptr() == GetWebContents());
ResourceRedirectDetails* resource_redirect_details =
content::Details<ResourceRedirectDetails>(details).ptr();
CHECK(resource_redirect_details);
@@ -659,7 +659,7 @@
return prerender_contents_.release();
}
-RenderViewHostDelegate* PrerenderContents::GetRenderViewHostDelegate() {
+WebContents* PrerenderContents::GetWebContents() {
if (!prerender_contents_.get())
return NULL;
return prerender_contents_->tab_contents();
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/safe_browsing/browser_feature_extractor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698