Remove the old task manager view

chrome/browser/task_management/task_manager_interface.cc

Index: chrome/browser/task_management/task_manager_interface.cc
diff --git a/chrome/browser/task_management/task_manager_interface.cc b/chrome/browser/task_management/task_manager_interface.cc
index 1383682872842c4a3d413d4d401dfa2fd54f4b62..57c8526281a48e89b75639ff1bc052b0a7fa2273 100644
--- a/chrome/browser/task_management/task_manager_interface.cc
+++ b/chrome/browser/task_management/task_manager_interface.cc
@@ -4,15 +4,38 @@
 
 #include "chrome/browser/task_management/task_manager_interface.h"
 
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/task_management/sampling/task_manager_impl.h"
 #include "chrome/browser/task_management/sampling/task_manager_io_thread_helper.h"
-#include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/task_manager/task_manager.h"
+#endif  // defined(OS_MACOSX)
+
 namespace task_management {
 
 // static
+void TaskManagerInterface::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterDictionaryPref(prefs::kTaskManagerWindowPlacement);
+  registry->RegisterDictionaryPref(prefs::kTaskManagerColumnVisibility);
+  registry->RegisterBooleanPref(prefs::kTaskManagerEndProcessEnabled, true);
+}
+
+// static
+bool TaskManagerInterface::IsEndProcessEnabled() {
+  if (g_browser_process->local_state()) {

[Lei Zhang, 2016/04/23 00:52:32]

auto* state = g_browser_process->local_state();
return state ? state->GetBoolean(prefs::kTaskManagerEndProcessEnabled) : true;

[afakhry, 2016/04/25 20:02:50]

Yup, shouldn't have just copied and pasted from the other file. Thanks!

Done.

+    return g_browser_process->local_state()->GetBoolean(
+        prefs::kTaskManagerEndProcessEnabled);
+  }
+  return true;
+}
+
+// static
 TaskManagerInterface* TaskManagerInterface::GetTaskManager() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -24,10 +47,11 @@ void TaskManagerInterface::OnRawBytesRead(const net::URLRequest& request,
                                           int64_t bytes_read) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-  if (switches::NewTaskManagerEnabled())
-    TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read);
-  else
-    TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
+#if defined(OS_MACOSX)
+  TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
+#else
+  TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read);
+#endif  // defined(OS_MACOSX)
 }
 
 void TaskManagerInterface::AddObserver(TaskManagerObserver* observer) {