From 31b34aacae32988cc01a0b249722973407912445 Mon Sep 17 00:00:00 2001 From: afakhry Date: Fri, 7 Aug 2015 10:55:56 -0700 Subject: New Task Manager - Phase 1.3.5: Implement Extension Task Providing CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation R=nick@chromium.org BUG=470994 TEST= Review URL: https://codereview.chromium.org/1254103002 Cr-Commit-Position: refs/heads/master@{#342377} --- extensions/browser/extensions_browser_client.h | 7 +++++++ extensions/browser/view_type_utils.cc | 3 +++ 2 files changed, 10 insertions(+) (limited to 'extensions') diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h index 838a343..8b66051 100644 --- a/extensions/browser/extensions_browser_client.h +++ b/extensions/browser/extensions_browser_client.h @@ -11,6 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "extensions/browser/extension_event_histogram_value.h" #include "extensions/browser/extension_prefs_observer.h" +#include "extensions/common/view_type.h" class ExtensionFunctionRegistry; class PrefService; @@ -226,6 +227,12 @@ class ExtensionsBrowserClient { int embedder_process_id, int view_instance_id) {} + // Attaches the task manager extension tag to |web_contents|, if needed based + // on |view_type|, so that its corresponding task shows up in the task + // manager. + virtual void AttachExtensionTaskManagerTag(content::WebContents* web_contents, + ViewType view_type) {} + // Returns the single instance of |this|. static ExtensionsBrowserClient* Get(); diff --git a/extensions/browser/view_type_utils.cc b/extensions/browser/view_type_utils.cc index ba72ceb..933d669 100644 --- a/extensions/browser/view_type_utils.cc +++ b/extensions/browser/view_type_utils.cc @@ -6,6 +6,7 @@ #include "base/lazy_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extensions_browser_client.h" using content::WebContents; @@ -39,6 +40,8 @@ ViewType GetViewType(WebContents* tab) { void SetViewType(WebContents* tab, ViewType type) { tab->SetUserData(&kViewTypeUserDataKey, new ViewTypeUserData(type)); + + ExtensionsBrowserClient::Get()->AttachExtensionTaskManagerTag(tab, type); } } // namespace extensions -- cgit v1.1