Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8429)

Unified Diff: chrome/browser/ui/views/new_task_manager_view.cc

Issue 1922683003: Make old task manager tests work against new task manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix OSX function call namespace Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/new_task_manager_view.h ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/ui/views/new_task_manager_view.h ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698