Make old task manager tests work against new task manager.

chrome/browser/ui/views/task_manager_view.cc

 // Copyright (c) 2012 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/task_manager/task_manager.h"
 
 #include <stddef.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 135 matching lines @@
 class TaskManagerView : public views::ButtonListener,
                         public views::DialogDelegateView,
                         public views::TableViewObserver,
                         public views::ContextMenuController,
                         public ui::SimpleMenuModel::Delegate {
  public:
   TaskManagerView();
   ~TaskManagerView() override;
 
   // Shows the Task Manager window, or re-activates an existing one.
-  static void Show(Browser* browser);
+  static ui::TableModel* Show(Browser* browser);
 
   // Hides the Task Manager if it is showing.
   static void Hide();
 
   // views::View:
   void Layout() override;
   gfx::Size GetPreferredSize() const override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
@@ skipping 249 matching lines @@
 }
 
 bool TaskManagerView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   DCHECK_EQ(ui::VKEY_W, accelerator.key_code());
   DCHECK_EQ(ui::EF_CONTROL_DOWN, accelerator.modifiers());
   GetWidget()->Close();
   return true;
 }
 
 // static
-void TaskManagerView::Show(Browser* browser) {
+ui::TableModel* TaskManagerView::Show(Browser* browser) {
   if (instance_) {
     // If there's a Task manager window open already, just activate it.
     instance_->GetWidget()->Activate();
-    return;
+    return instance_->table_model_.get();
   }
   instance_ = new TaskManagerView();
   gfx::NativeWindow window =
       browser ? browser->window()->GetNativeWindow() : NULL;
 #if defined(USE_ASH)
   if (!window)
     window = ash::wm::GetActiveWindow();
 #endif
   DialogDelegate::CreateDialogWidget(instance_, window, NULL);
   instance_->InitAlwaysOnTopState();
@@ skipping 14 matching lines @@
   // Set the initial focus to the list of tasks.
   views::FocusManager* focus_manager = instance_->GetFocusManager();
   if (focus_manager)
     focus_manager->SetFocusedView(instance_->tab_table_);
 
 #if defined(USE_ASH)
   gfx::NativeWindow native_window = instance_->GetWidget()->GetNativeWindow();
   ash::SetShelfItemDetailsForDialogWindow(
       native_window, IDR_ASH_SHELF_ICON_TASK_MANAGER, native_window->title());
 #endif
+  return instance_->table_model_.get();
 }
 
 // static
 void TaskManagerView::Hide() {
   if (instance_)
     instance_->GetWidget()->Close();
 }
 
 // ButtonListener implementation.
 void TaskManagerView::ButtonPressed(
@@ skipping 131 matching lines @@
       g_browser_process->local_state()->GetDictionary(GetWindowName());
   return dictionary &&
       dictionary->GetBoolean("always_on_top", always_on_top) && always_on_top;
 }
 
 }  // namespace
 
 namespace chrome {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
-void ShowTaskManager(Browser* browser) {
+ui::TableModel* ShowTaskManager(Browser* browser) {
   if (switches::NewTaskManagerEnabled()) {
-    task_management::NewTaskManagerView::Show(browser);
-    return;
+    return task_management::NewTaskManagerView::Show(browser);
   }
 
-  TaskManagerView::Show(browser);
+  return TaskManagerView::Show(browser);
 }
 
 void HideTaskManager() {
   if (switches::NewTaskManagerEnabled()) {
     task_management::NewTaskManagerView::Hide();
     return;
   }
 
   TaskManagerView::Hide();
 }
 
 }  // namespace chrome