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

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: 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 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 AddResourceProvider( 262 AddResourceProvider(
264 new task_manager::ChildProcessResourceProvider(task_manager)); 263 new task_manager::ChildProcessResourceProvider(task_manager));
265 AddResourceProvider(new task_manager::WebContentsResourceProvider( 264 AddResourceProvider(new task_manager::WebContentsResourceProvider(
266 task_manager, 265 task_manager,
267 scoped_ptr<WebContentsInformation>( 266 scoped_ptr<WebContentsInformation>(
268 new task_manager::ExtensionInformation()))); 267 new task_manager::ExtensionInformation())));
269 AddResourceProvider(new task_manager::WebContentsResourceProvider( 268 AddResourceProvider(new task_manager::WebContentsResourceProvider(
270 task_manager, 269 task_manager,
271 scoped_ptr<WebContentsInformation>( 270 scoped_ptr<WebContentsInformation>(
272 new task_manager::GuestInformation()))); 271 new task_manager::GuestInformation())));
273
274 AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager));
275 } 272 }
276 273
277 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) { 274 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) {
278 observer_list_.AddObserver(observer); 275 observer_list_.AddObserver(observer);
279 } 276 }
280 277
281 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) { 278 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) {
282 observer_list_.RemoveObserver(observer); 279 observer_list_.RemoveObserver(observer);
283 } 280 }
284 281
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 params.host_desktop_type = desktop_type; 1552 params.host_desktop_type = desktop_type;
1556 chrome::Navigate(&params); 1553 chrome::Navigate(&params);
1557 } 1554 }
1558 1555
1559 TaskManager::TaskManager() 1556 TaskManager::TaskManager()
1560 : model_(new TaskManagerModel(this)) { 1557 : model_(new TaskManagerModel(this)) {
1561 } 1558 }
1562 1559
1563 TaskManager::~TaskManager() { 1560 TaskManager::~TaskManager() {
1564 } 1561 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698