| 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 254071ef1517c9c8840f360aaa466fc01a178d48..7b06d59b41b98e89f22efc4ee251214b1e23714f 100644
|
| --- a/chrome/browser/ui/views/new_task_manager_view.cc
|
| +++ b/chrome/browser/ui/views/new_task_manager_view.cc
|
| @@ -10,8 +10,8 @@
|
| #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"
|
| @@ -257,7 +257,7 @@ void NewTaskManagerView::OnSelectionChanged() {
|
|
|
| kill_button_->SetEnabled(!selection_contains_browser_process &&
|
| !selections.empty() &&
|
| - TaskManager::IsEndProcessEnabled());
|
| + TaskManagerInterface::IsEndProcessEnabled());
|
| }
|
|
|
| void NewTaskManagerView::OnDoubleClick() {
|
| @@ -383,3 +383,20 @@ void NewTaskManagerView::RetriveSavedAlwaysOnTopState() {
|
| }
|
|
|
| } // namespace task_management
|
| +
|
| +#if !defined(OS_MACOSX)
|
| +
|
| +namespace chrome {
|
| +
|
| +// Declared in browser_dialogs.h so others don't need to depend on our header.
|
| +void ShowTaskManager(Browser* browser) {
|
| + task_management::NewTaskManagerView::Show(browser);
|
| +}
|
| +
|
| +void HideTaskManager() {
|
| + task_management::NewTaskManagerView::Hide();
|
| +}
|
| +
|
| +} // namespace chrome
|
| +
|
| +#endif // !defined(OS_MACOSX)
|
|
|