Index: chrome/browser/ui/views/new_task_manager_view.cc |
diff --git a/chrome/browser/ui/views/new_task_manager_view.cc b/chrome/browser/ui/views/new_task_manager_view.cc |
index d1d53a538b9c0499eaf3ec5d7826870673a5a0ab..e2e58c03f8d1bb40c9ac710db1bae79175a85496 100644 |
--- a/chrome/browser/ui/views/new_task_manager_view.cc |
+++ b/chrome/browser/ui/views/new_task_manager_view.cc |
@@ -10,8 +10,9 @@ |
#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" |
@@ -210,7 +211,7 @@ bool NewTaskManagerView::IsDialogButtonEnabled(ui::DialogButton button) const { |
return false; |
} |
- return !selections.empty() && TaskManager::IsEndProcessEnabled(); |
+ return !selections.empty() && TaskManagerInterface::IsEndProcessEnabled(); |
} |
void NewTaskManagerView::WindowClosing() { |
@@ -361,3 +362,20 @@ void NewTaskManagerView::RetrieveSavedAlwaysOnTopState() { |
} |
} // 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
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) |