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

Side by Side Diff: chrome/browser/task_manager/task_manager.cc

Issue 411283002: Remove disable-embedded-shared-worker flag and shared worker process related codes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/number_formatting.h" 8 #include "base/i18n/number_formatting.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
11 #include "base/process/process_metrics.h" 11 #include "base/process/process_metrics.h"
12 #include "base/rand_util.h" 12 #include "base/rand_util.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/task_manager/background_information.h" 20 #include "chrome/browser/task_manager/background_information.h"
21 #include "chrome/browser/task_manager/browser_process_resource_provider.h" 21 #include "chrome/browser/task_manager/browser_process_resource_provider.h"
22 #include "chrome/browser/task_manager/child_process_resource_provider.h" 22 #include "chrome/browser/task_manager/child_process_resource_provider.h"
23 #include "chrome/browser/task_manager/extension_information.h" 23 #include "chrome/browser/task_manager/extension_information.h"
24 #include "chrome/browser/task_manager/guest_information.h" 24 #include "chrome/browser/task_manager/guest_information.h"
25 #include "chrome/browser/task_manager/panel_information.h" 25 #include "chrome/browser/task_manager/panel_information.h"
26 #include "chrome/browser/task_manager/printing_information.h" 26 #include "chrome/browser/task_manager/printing_information.h"
27 #include "chrome/browser/task_manager/resource_provider.h" 27 #include "chrome/browser/task_manager/resource_provider.h"
28 #include "chrome/browser/task_manager/tab_contents_information.h" 28 #include "chrome/browser/task_manager/tab_contents_information.h"
29 #include "chrome/browser/task_manager/web_contents_resource_provider.h" 29 #include "chrome/browser/task_manager/web_contents_resource_provider.h"
30 #include "chrome/browser/task_manager/worker_resource_provider.h"
31 #include "chrome/browser/ui/browser_navigator.h" 30 #include "chrome/browser/ui/browser_navigator.h"
32 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
33 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
34 #include "components/nacl/browser/nacl_browser.h" 33 #include "components/nacl/browser/nacl_browser.h"
35 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/gpu_data_manager.h" 35 #include "content/public/browser/gpu_data_manager.h"
37 #include "content/public/browser/gpu_data_manager_observer.h" 36 #include "content/public/browser/gpu_data_manager_observer.h"
38 #include "content/public/browser/resource_request_info.h" 37 #include "content/public/browser/resource_request_info.h"
39 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
40 #include "content/public/browser/web_contents_delegate.h" 39 #include "content/public/browser/web_contents_delegate.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 AddResourceProvider( 263 AddResourceProvider(
265 new task_manager::ChildProcessResourceProvider(task_manager)); 264 new task_manager::ChildProcessResourceProvider(task_manager));
266 AddResourceProvider(new task_manager::WebContentsResourceProvider( 265 AddResourceProvider(new task_manager::WebContentsResourceProvider(
267 task_manager, 266 task_manager,
268 scoped_ptr<WebContentsInformation>( 267 scoped_ptr<WebContentsInformation>(
269 new task_manager::ExtensionInformation()))); 268 new task_manager::ExtensionInformation())));
270 AddResourceProvider(new task_manager::WebContentsResourceProvider( 269 AddResourceProvider(new task_manager::WebContentsResourceProvider(
271 task_manager, 270 task_manager,
272 scoped_ptr<WebContentsInformation>( 271 scoped_ptr<WebContentsInformation>(
273 new task_manager::GuestInformation()))); 272 new task_manager::GuestInformation())));
274
275 // We don't need to show the worker processes if "embedded-shared-worker" flag
276 // is enabled.
277 if (!content::WorkerService::EmbeddedSharedWorkerEnabled())
278 AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager));
279 } 273 }
280 274
281 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) { 275 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) {
282 observer_list_.AddObserver(observer); 276 observer_list_.AddObserver(observer);
283 } 277 }
284 278
285 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) { 279 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) {
286 observer_list_.RemoveObserver(observer); 280 observer_list_.RemoveObserver(observer);
287 } 281 }
288 282
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 params.host_desktop_type = desktop_type; 1553 params.host_desktop_type = desktop_type;
1560 chrome::Navigate(&params); 1554 chrome::Navigate(&params);
1561 } 1555 }
1562 1556
1563 TaskManager::TaskManager() 1557 TaskManager::TaskManager()
1564 : model_(new TaskManagerModel(this)) { 1558 : model_(new TaskManagerModel(this)) {
1565 } 1559 }
1566 1560
1567 TaskManager::~TaskManager() { 1561 TaskManager::~TaskManager() {
1568 } 1562 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/child_process_resource_provider.cc ('k') | chrome/browser/task_manager/worker_resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698