summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorafakhry <afakhry@chromium.org>2015-08-07 10:55:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-07 17:56:39 +0000
commit31b34aacae32988cc01a0b249722973407912445 (patch)
tree57213627eddb9e454d89252276d8974a543d31ad /extensions
parentfcf5d24c6b47d9ad05ffd01cfbdb6fcd73e01136 (diff)
downloadchromium_src-31b34aacae32988cc01a0b249722973407912445.zip
chromium_src-31b34aacae32988cc01a0b249722973407912445.tar.gz
chromium_src-31b34aacae32988cc01a0b249722973407912445.tar.bz2
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}
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/extensions_browser_client.h7
-rw-r--r--extensions/browser/view_type_utils.cc3
2 files changed, 10 insertions, 0 deletions
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