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 95fdb0a0dd4817a00c0f652fd806f1a5b11757b4..ba962f6d49f33bd20a136fcb6952d13511cea204 100644 |
--- a/chrome/browser/task_manager/task_manager.cc |
+++ b/chrome/browser/task_manager/task_manager.cc |
@@ -35,12 +35,9 @@ |
#include "chrome/browser/ui/browser_navigator.h" |
#include "chrome/browser/ui/browser_navigator_params.h" |
#include "chrome/browser/ui/user_manager.h" |
-#include "chrome/common/pref_names.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/generated_resources.h" |
#include "components/nacl/browser/nacl_browser.h" |
-#include "components/prefs/pref_registry_simple.h" |
-#include "components/prefs/pref_service.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/gpu_data_manager.h" |
#include "content/public/browser/gpu_data_manager_observer.h" |
@@ -1503,21 +1500,6 @@ Resource* TaskManagerModel::GetResource(int index) const { |
//////////////////////////////////////////////////////////////////////////////// |
// TaskManager class |
//////////////////////////////////////////////////////////////////////////////// |
-// static |
-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 { |
// If some of the selection is out of bounds, ignore. This may happen when |