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

Unified Diff: chrome/browser/task_manager/tab_contents_resource_provider.cc

Issue 23576007: FindBrowserWithWebContents now recognises DevTool's embedded WebContent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use IsDevToolsWindow to check for DevTools Created 7 years, 4 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 | « no previous file | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/tab_contents_resource_provider.cc
diff --git a/chrome/browser/task_manager/tab_contents_resource_provider.cc b/chrome/browser/task_manager/tab_contents_resource_provider.cc
index 87659b145bb8682186b87a28b1c67e3f443c1335..831a140baee877e52dd2e4226833ca591c1065a4 100644
--- a/chrome/browser/task_manager/tab_contents_resource_provider.cc
+++ b/chrome/browser/task_manager/tab_contents_resource_provider.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/prerender/prerender_manager.h"
@@ -148,6 +149,7 @@ string16 TabContentsResource::GetProfileName() const {
gfx::ImageSkia TabContentsResource::GetIcon() const {
if (IsContentsPrerendering(web_contents_))
return *prerender_icon_;
+ FaviconTabHelper::CreateForWebContents(web_contents_);
return FaviconTabHelper::FromWebContents(web_contents_)->
GetFavicon().AsImageSkia();
}
@@ -291,7 +293,8 @@ void TabContentsResourceProvider::Add(WebContents* web_contents) {
if (!chrome::FindBrowserWithWebContents(web_contents) &&
!IsContentsPrerendering(web_contents) &&
!chrome::IsPreloadedInstantExtendedNTP(web_contents) &&
- !IsContentsBackgroundPrinted(web_contents)) {
+ !IsContentsBackgroundPrinted(web_contents) &&
+ !DevToolsWindow::IsDevToolsWindow(web_contents->GetRenderViewHost())) {
return;
}
« no previous file with comments | « no previous file | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698