| 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 9cef45aea51f1be0c55ba43b839fffecfb59f5b7..767f9b459eed3efa05b1a98faeda6221d793e09e 100644
|
| --- a/chrome/browser/ui/views/new_task_manager_view.cc
|
| +++ b/chrome/browser/ui/views/new_task_manager_view.cc
|
| @@ -53,11 +53,12 @@ NewTaskManagerView::~NewTaskManagerView() {
|
| }
|
|
|
| // static
|
| -void NewTaskManagerView::Show(Browser* browser) {
|
| +task_management::TaskManagerTableModel* NewTaskManagerView::Show(
|
| + Browser* browser) {
|
| if (g_task_manager_view) {
|
| // If there's a Task manager window open already, just activate it.
|
| g_task_manager_view->GetWidget()->Activate();
|
| - return;
|
| + return g_task_manager_view->table_model_.get();
|
| }
|
|
|
| g_task_manager_view = new NewTaskManagerView();
|
| @@ -101,6 +102,7 @@ void NewTaskManagerView::Show(Browser* browser) {
|
| IDR_ASH_SHELF_ICON_TASK_MANAGER,
|
| native_window->title());
|
| #endif
|
| + return g_task_manager_view->table_model_.get();
|
| }
|
|
|
| // static
|
|
|