OLD | NEW |
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/location.h" | 10 #include "base/location.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "chrome/browser/task_manager/extension_information.h" | 28 #include "chrome/browser/task_manager/extension_information.h" |
29 #include "chrome/browser/task_manager/guest_information.h" | 29 #include "chrome/browser/task_manager/guest_information.h" |
30 #include "chrome/browser/task_manager/panel_information.h" | 30 #include "chrome/browser/task_manager/panel_information.h" |
31 #include "chrome/browser/task_manager/printing_information.h" | 31 #include "chrome/browser/task_manager/printing_information.h" |
32 #include "chrome/browser/task_manager/resource_provider.h" | 32 #include "chrome/browser/task_manager/resource_provider.h" |
33 #include "chrome/browser/task_manager/tab_contents_information.h" | 33 #include "chrome/browser/task_manager/tab_contents_information.h" |
34 #include "chrome/browser/task_manager/web_contents_resource_provider.h" | 34 #include "chrome/browser/task_manager/web_contents_resource_provider.h" |
35 #include "chrome/browser/ui/browser_navigator.h" | 35 #include "chrome/browser/ui/browser_navigator.h" |
36 #include "chrome/browser/ui/browser_navigator_params.h" | 36 #include "chrome/browser/ui/browser_navigator_params.h" |
37 #include "chrome/browser/ui/user_manager.h" | 37 #include "chrome/browser/ui/user_manager.h" |
| 38 #include "chrome/common/chrome_switches.h" |
38 #include "chrome/common/pref_names.h" | 39 #include "chrome/common/pref_names.h" |
39 #include "chrome/common/url_constants.h" | 40 #include "chrome/common/url_constants.h" |
40 #include "chrome/grit/generated_resources.h" | 41 #include "chrome/grit/generated_resources.h" |
41 #include "components/nacl/browser/nacl_browser.h" | 42 #include "components/nacl/browser/nacl_browser.h" |
42 #include "components/prefs/pref_registry_simple.h" | 43 #include "components/prefs/pref_registry_simple.h" |
43 #include "components/prefs/pref_service.h" | 44 #include "components/prefs/pref_service.h" |
44 #include "content/public/browser/browser_thread.h" | 45 #include "content/public/browser/browser_thread.h" |
45 #include "content/public/browser/gpu_data_manager.h" | 46 #include "content/public/browser/gpu_data_manager.h" |
46 #include "content/public/browser/gpu_data_manager_observer.h" | 47 #include "content/public/browser/gpu_data_manager_observer.h" |
47 #include "content/public/browser/resource_request_info.h" | 48 #include "content/public/browser/resource_request_info.h" |
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1547 void TaskManager::OnWindowClosed() { | 1548 void TaskManager::OnWindowClosed() { |
1548 model_->StopUpdating(); | 1549 model_->StopUpdating(); |
1549 } | 1550 } |
1550 | 1551 |
1551 void TaskManager::ModelChanged() { | 1552 void TaskManager::ModelChanged() { |
1552 model_->ModelChanged(); | 1553 model_->ModelChanged(); |
1553 } | 1554 } |
1554 | 1555 |
1555 // static | 1556 // static |
1556 TaskManager* TaskManager::GetInstance() { | 1557 TaskManager* TaskManager::GetInstance() { |
| 1558 CHECK(!switches::NewTaskManagerEnabled()); |
1557 return base::Singleton<TaskManager>::get(); | 1559 return base::Singleton<TaskManager>::get(); |
1558 } | 1560 } |
1559 | 1561 |
1560 TaskManager::TaskManager() | 1562 TaskManager::TaskManager() |
1561 : model_(new TaskManagerModel(this)) { | 1563 : model_(new TaskManagerModel(this)) { |
1562 } | 1564 } |
1563 | 1565 |
1564 TaskManager::~TaskManager() { | 1566 TaskManager::~TaskManager() { |
1565 } | 1567 } |
OLD | NEW |