| Index: chrome/browser/task_manager/task_manager.cc
|
| diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
|
| index f179f70a994626b5e07cb31ef31ebdd9dfcce010..91f80c92f62feada8cea2074baba0978017f0eeb 100644
|
| --- a/chrome/browser/task_manager/task_manager.cc
|
| +++ b/chrome/browser/task_manager/task_manager.cc
|
| @@ -1513,6 +1513,16 @@ Resource* TaskManagerModel::GetResource(int index) const {
|
| void TaskManager::RegisterPrefs(PrefRegistrySimple* registry) {
|
| registry->RegisterDictionaryPref(prefs::kTaskManagerWindowPlacement);
|
| registry->RegisterDictionaryPref(prefs::kTaskManagerColumnVisibility);
|
| + registry->RegisterBooleanPref(prefs::kTaskManagerEndProcessEnabled, true);
|
| +}
|
| +
|
| +// static
|
| +bool TaskManager::IsEndProcessEnabled() {
|
| + if (g_browser_process->local_state()) {
|
| + return g_browser_process->local_state()->GetBoolean(
|
| + prefs::kTaskManagerEndProcessEnabled);
|
| + }
|
| + return true;
|
| }
|
|
|
| bool TaskManager::IsBrowserProcess(int index) const {
|
|
|