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

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

Issue 415013002: Don't use WorkerResourceProvider if --disable-embedded-shared-worker is not set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/task_manager.cc
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 3bed73082f1a81277bf02848be78b8883fedfd64..8ae32cd0015c1bfc92518fef638d15268dfc09a6 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -38,6 +38,7 @@
#include "content/public/browser/resource_request_info.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/worker_service.h"
#include "content/public/common/result_codes.h"
#include "extensions/browser/extension_system.h"
#include "grit/generated_resources.h"
@@ -271,7 +272,10 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
scoped_ptr<WebContentsInformation>(
new task_manager::GuestInformation())));
- AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager));
+ // We don't need to show the worker processes if "embedded-shared-worker" flag
+ // is enabled.
+ if (!content::WorkerService::EmbeddedSharedWorkerEnabled())
+ AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager));
}
void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698