diff options
| author | horo@chromium.org <horo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 00:06:33 +0000 |
|---|---|---|
| committer | horo@chromium.org <horo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 00:06:33 +0000 |
| commit | d455fd38bfdccca1f91a88f564c65b06c9e7dea3 (patch) | |
| tree | d42a96a6d88ac60e1900359fc89d344ca2ea1636 | |
| parent | 2698141e7c07e4f6f8c3cbfbd1eeb9645f131656 (diff) | |
| download | chromium_src-d455fd38bfdccca1f91a88f564c65b06c9e7dea3.zip chromium_src-d455fd38bfdccca1f91a88f564c65b06c9e7dea3.tar.gz chromium_src-d455fd38bfdccca1f91a88f564c65b06c9e7dea3.tar.bz2 | |
Don't use WorkerResourceProvider if --disable-embedded-shared-worker is not set.
BUG=364243,396970
Review URL: https://codereview.chromium.org/415013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285424 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/task_manager/task_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 3bed730..8ae32cd 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) { |