Skip to content

Commit

Permalink
Don't use WorkerResourceProvider if --disable-embedded-shared-worker …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
horo@chromium.org committed Jul 25, 2014
1 parent 2698141 commit d455fd3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion chrome/browser/task_manager/task_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit d455fd3

Please sign in to comment.