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..f2163f606664e63e4f66908f526c96e49cdf67f4 100644 |
--- a/chrome/browser/task_manager/task_manager.cc |
+++ b/chrome/browser/task_manager/task_manager.cc |
@@ -32,15 +32,14 @@ |
#include "chrome/browser/task_manager/resource_provider.h" |
#include "chrome/browser/task_manager/tab_contents_information.h" |
#include "chrome/browser/task_manager/web_contents_resource_provider.h" |
+#include "chrome/browser/ui/browser_dialogs.h" |
#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_child_process_host.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" |
@@ -57,10 +56,6 @@ |
#include "ui/gfx/image/image_skia.h" |
#include "ui/resources/grit/ui_resources.h" |
-#if defined(OS_MACOSX) |
-#include "content/public/browser/browser_child_process_host.h" |
-#endif |
- |
using content::BrowserThread; |
using content::ResourceRequestInfo; |
using content::WebContents; |
@@ -1503,20 +1498,10 @@ 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::NewTaskManagerEnabled() { |
+ return chrome::ToolkitViewsDialogsEnabled(); |
} |
bool TaskManager::IsBrowserProcess(int index) const { |