Remove the old task manager view

chrome/browser/task_management/task_manager_interface.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"

[tapted, 2016/05/20 00:08:45]

This can't be included here - task_manager.h isn't part of the a mac views
browser build, (but of course OS_MACOSX is defined there).

[afakhry, 2016/05/20 02:32:50]

Done.

+#include "chrome/browser/ui/browser_dialogs.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() {
+  PrefService* state = g_browser_process->local_state();
+  return !state || state->GetBoolean(prefs::kTaskManagerEndProcessEnabled);
+}
+
+#if defined(OS_MACOSX)
+// static
+bool TaskManagerInterface::IsNewTaskManagerEnabled() {
+  return chrome::ToolkitViewsDialogsEnabled();
+}
+#endif  // defined(OS_MACOSX)
+
+// static
 TaskManagerInterface* TaskManagerInterface::GetTaskManager() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   return TaskManagerImpl::GetInstance();
 }
 
 // static
 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
+#if defined(OS_MACOSX)
+  if (!TaskManagerInterface::IsNewTaskManagerEnabled()) {

[tapted, 2016/05/20 00:08:45]

My suggested fix is in
https://codereview.chromium.org/1924683003/diff/100001/chrome/browser/task_ma...

It adds a method to task_manager_mac.mm (which *isn't* build on
mac_views_browser), which goes like:

bool NotifyOldTaskManagerBytesRead(const net::URLRequest& request,
                                   int64_t bytes_read) {
  if (TaskManager::NewTaskManagerEnabled())
    return false;

  TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
  return true;
}

Then NotifyOldTaskManagerBytesRead (which is declared in browser_dialogs.h) gets
called here instead. Another version of NotifyOldTaskManagerBytesRead for the
mac views browser goes in browser_dialogs_views.cc which always returns false.

[afakhry, 2016/05/20 02:32:50]

Done.

     TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
+    return;
+  }
+#endif  // defined(OS_MACOSX)
+
+  TaskManagerIoThreadHelper::OnRawBytesRead(request, bytes_read);
 }
 
 void TaskManagerInterface::AddObserver(TaskManagerObserver* observer) {
   observers_.AddObserver(observer);
   observer->observed_task_manager_ = this;
 
   ResourceFlagsAdded(observer->desired_resources_flags());
 
   base::TimeDelta current_refresh_time = GetCurrentRefreshTime();
   if (current_refresh_time == base::TimeDelta::Max()) {
@@ skipping 98 matching lines @@
 }
 
 void TaskManagerInterface::ScheduleRefresh(base::TimeDelta refresh_time) {
   refresh_timer_->Start(FROM_HERE,
                         refresh_time,
                         base::Bind(&TaskManagerInterface::Refresh,
                                    base::Unretained(this)));
 }
 
 }  // namespace task_management