Remove the old task manager view

chrome/browser/ui/views/new_task_manager_view.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/ui/views/new_task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
+#include "chrome/browser/task_management/task_manager_interface.h"
 #include "chrome/browser/task_management/task_manager_observer.h"
-#include "chrome/browser/task_manager/task_manager.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/task_manager/task_manager_columns.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
@@ skipping 178 matching lines @@
 }
 
 bool NewTaskManagerView::IsDialogButtonEnabled(ui::DialogButton button) const {
   const ui::ListSelectionModel::SelectedIndices& selections(
       tab_table_->selection_model().selected_indices());
   for (const auto& selection : selections) {
     if (table_model_->IsBrowserProcess(selection))
       return false;
   }
 
-  return !selections.empty() && TaskManager::IsEndProcessEnabled();
+  return !selections.empty() && TaskManagerInterface::IsEndProcessEnabled();
 }
 
 void NewTaskManagerView::WindowClosing() {
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (g_task_manager_view == this) {
     // We don't have to delete |g_task_manager_view| as we don't own it. It's
     // owned by the Views hierarchy.
     g_task_manager_view = nullptr;
@@ skipping 130 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
     g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_management
+
+#if !defined(OS_MACOSX)
+
+namespace chrome {
+
+// Declared in browser_dialogs.h so others don't need to depend on our header.
+ui::TableModel* ShowTaskManager(Browser* browser) {

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

These need to go in browser_dialogs_views.cc this allows a mac_views_browser
build to get at them. They can't be guarded by OS_MACOSX

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

Done.

+  return task_management::NewTaskManagerView::Show(browser);
+}
+
+void HideTaskManager() {
+  task_management::NewTaskManagerView::Hide();
+}
+
+}  // namespace chrome
+
+#endif  // !defined(OS_MACOSX)