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_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 225 matching lines @@
   bool selection_contains_browser_process = false;
   for (const auto& selection : selections) {
     if (table_model_->IsBrowserProcess(selection)) {
       selection_contains_browser_process = true;
       break;
     }
   }
 
   kill_button_->SetEnabled(!selection_contains_browser_process &&
                            !selections.empty() &&
-                           TaskManager::IsEndProcessEnabled());
+                           TaskManagerInterface::IsEndProcessEnabled());
 }
 
 void NewTaskManagerView::OnDoubleClick() {
   ActivateFocusedTab();
 }
 
 void NewTaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
   if (keycode == ui::VKEY_RETURN)
     ActivateFocusedTab();
 }
@@ skipping 105 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.

[tapted, 2016/04/26 01:54:03]

There is also 

chrome/browser/ui/views/browser_dialogs_views.h

(it's fine for that to #include new_task_manager_view.h)

But approach is OK too

[tapted, 2016/04/26 03:25:24]

Ah, actually it's not ;). With mac_views_browser=1, it will give 

Undefined symbols for architecture x86_64:
  "chrome::HideTaskManager()", referenced from:
      profiles::LockBrowserCloseSuccess(base::FilePath const&) in
libbrowser.a(browser.profile_window.o)
  "chrome::ShowTaskManager(Browser*)", referenced from:
      chrome::OpenTaskManager(Browser*) in
libbrowser_ui.a(browser_ui.browser_commands.o)

But to fix you just need to remove the #if !defined(OS_MACOSX)

Both new_task_manager_view.cc and
chrome/browser/ui/views/browser_dialogs_views.cc are only built on mac if
mac_views_browser=1 is set (which excludes the cocoa implementation), so there
won't be a duplicate symbol.

[afakhry, 2016/04/26 22:22:43]

There are no browser_dialogs_views.h.

There will be duplicate symbols if we remove #if !defined(OS_MACOSX) here
(please see
https://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_...).

I don't think task_manager_mac.mm is excluded when mac_views_browser=1, right?
Isn't starting the views implementation is based on a runtime switch:
switches::kEnableMacViewsDialogs?

[tapted, 2016/04/26 22:43:50]

Sorry - typo. it should go in browser_dialogs_views.cc[1] with
LoginHandler::Create and  BookmarkEditor::Show - there's a long comment in that
file explaining its purpose. Note its excluded on a mac *cocoa* build so there
shouldn't be duplicate symbols.

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...
task_manager_mac.mm is excluded at compile time when mac_views_browser=1 is set
in gyp (all of chrome_browser_ui_cocoa_sources is)

Apologies again - I know it's confusing. I'll send you a diff after testing a
local mac_views_browser=1 build

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