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

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

Issue 10978016: Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: nits and fixed prerender browser tests Created 8 years, 3 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/browser/prerender/prerender_manager.cc
===================================================================
--- chrome/browser/prerender/prerender_manager.cc (revision 158566)
+++ chrome/browser/prerender/prerender_manager.cc (working copy)
@@ -600,21 +600,11 @@
return GetMode() == PRERENDER_MODE_EXPERIMENT_NO_USE_GROUP;
}
-// static
bool PrerenderManager::IsWebContentsPrerendering(
WebContents* web_contents) const {
DCHECK(CalledOnValidThread());
- for (std::list<linked_ptr<PrerenderData> >::const_iterator it =
- active_prerender_list_.begin();
- it != active_prerender_list_.end();
- ++it) {
- TabContents* prerender_tab_contents =
- it->get()->contents_->prerender_contents();
- if (prerender_tab_contents &&
- prerender_tab_contents->web_contents() == web_contents) {
- return true;
- }
- }
+ if (GetPrerenderContents(web_contents))
+ return true;
// Also look through the pending-deletion list.
for (std::list<PrerenderContents*>::const_iterator it =
@@ -630,6 +620,23 @@
return false;
}
+PrerenderContents* PrerenderManager::GetPrerenderContents(
+ content::WebContents* web_contents) const {
+ DCHECK(CalledOnValidThread());
+ for (std::list<linked_ptr<PrerenderData> >::const_iterator it =
+ active_prerender_list_.begin();
+ it != active_prerender_list_.end();
+ ++it) {
+ TabContents* prerender_tab_contents =
+ it->get()->contents_->prerender_contents();
+ if (prerender_tab_contents &&
+ prerender_tab_contents->web_contents() == web_contents) {
+ return it->get()->contents_;
+ }
+ }
+ return NULL;
+}
+
void PrerenderManager::MarkWebContentsAsPrerendered(WebContents* web_contents) {
DCHECK(CalledOnValidThread());
prerendered_tab_contents_set_.insert(web_contents);

Powered by Google App Engine
This is Rietveld 408576698