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

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

Issue 1185183008: New Task Manager - Phase 1.3.2.B: Implement Tab Contents Task Providing (Prerender) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gavinp's and thestig's comments Created 5 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
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index fb7daa97816557294ef6be57a1d4ed3e29eaf13e..d9da3395e51849504be92f44d334d5ec5a2d49fc 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/prerender/prerender_manager_factory.h"
#include "chrome/browser/prerender/prerender_resource_throttle.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/task_management/web_contents_tags.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tab_helpers.h"
#include "chrome/browser/ui/web_contents_sizer.h"
@@ -279,6 +280,11 @@ void PrerenderContents::StartPrerendering(
TabHelpers::AttachTabHelpers(prerender_contents_.get());
content::WebContentsObserver::Observe(prerender_contents_.get());
+ // Tag the prerender contents with the task manager specific prerender tag, so
+ // that it shows up in the task manager.
+ task_management::WebContentsTags::CreateForPrerenderContents(
+ prerender_contents_.get());
+
web_contents_delegate_.reset(new WebContentsDelegateImpl(this));
prerender_contents_.get()->SetDelegate(web_contents_delegate_.get());
// Set the size of the prerender WebContents.
@@ -671,6 +677,11 @@ void PrerenderContents::DestroyWhenUsingTooManyResources() {
WebContents* PrerenderContents::ReleasePrerenderContents() {
prerender_contents_->SetDelegate(NULL);
content::WebContentsObserver::Observe(NULL);
+
+ // Clear the task manager tag we added earlier to our
+ // WebContents since it's no longer a prerender contents.
+ task_management::WebContentsTags::ClearTag(prerender_contents_.get());
+
return prerender_contents_.release();
}

Powered by Google App Engine
This is Rietveld 408576698