TaskManager: when shown or activated, select the last active tab.

chrome/browser/ui/views/new_task_manager_view.cc

 // Copyright 2015 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/ui/views/new_task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #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/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/task_manager/task_manager_columns.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/views/border.h"
@@ skipping 28 matching lines @@
 NewTaskManagerView::~NewTaskManagerView() {
   // Delete child views now, while our table model still exists.
   RemoveAllChildViews(true);
 }
 
 // static
 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->SelectTaskOfActiveTab(browser);
     g_task_manager_view->GetWidget()->Activate();
     return g_task_manager_view->table_model_.get();
   }
 
   g_task_manager_view = new NewTaskManagerView();
 
   gfx::NativeWindow window = browser ? browser->window()->GetNativeWindow()
                                      : nullptr;
 #if defined(USE_ASH)
   if (!window)
@@ skipping 10 matching lines @@
   // no parent is specified, the app id will default to that of the initial
   // process.
   if (browser) {
     ui::win::SetAppIdForWindow(
         shell_integration::win::GetChromiumModelIdForProfile(
             browser->profile()->GetPath()),
         views::HWNDForWidget(g_task_manager_view->GetWidget()));
   }
 #endif
 
+  g_task_manager_view->SelectTaskOfActiveTab(browser);
   g_task_manager_view->GetWidget()->Show();
 
   // Set the initial focus to the list of tasks.
   views::FocusManager* focus_manager =
       g_task_manager_view->GetFocusManager();
   if (focus_manager)
     focus_manager->SetFocusedView(g_task_manager_view->tab_table_);
 
 #if defined(USE_ASH)
   gfx::NativeWindow native_window =
@@ skipping 136 matching lines @@
 void NewTaskManagerView::GetGroupRange(int model_index,
                                        views::GroupRange* range) {
   table_model_->GetRowsGroupRange(model_index, &range->start, &range->length);
 }
 
 void NewTaskManagerView::OnSelectionChanged() {
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 void NewTaskManagerView::OnDoubleClick() {
-  ActivateFocusedTab();
+  ActivateSelectedTab();
 }
 
 void NewTaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
   if (keycode == ui::VKEY_RETURN)
-    ActivateFocusedTab();
+    ActivateSelectedTab();
 }
 
 void NewTaskManagerView::ShowContextMenuForView(
     views::View* source,
     const gfx::Point& point,
     ui::MenuSourceType source_type) {
   ui::SimpleMenuModel menu_model(this);
 
   for (const auto& table_column : columns_) {
     menu_model.AddCheckItem(table_column.id,
@@ skipping 71 matching lines @@
   table_model_->RetrieveSavedColumnsSettingsAndUpdateTable();
 
   AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
 }
 
 void NewTaskManagerView::InitAlwaysOnTopState() {
   RetrieveSavedAlwaysOnTopState();
   GetWidget()->SetAlwaysOnTop(is_always_on_top_);
 }
 
-void NewTaskManagerView::ActivateFocusedTab() {
+void NewTaskManagerView::ActivateSelectedTab() {
   const int active_row = tab_table_->selection_model().active();
   if (active_row != ui::ListSelectionModel::kUnselectedIndex)
     table_model_->ActivateTask(active_row);
 }
 
+void NewTaskManagerView::SelectTaskOfActiveTab(Browser* browser) {
+  if (browser) {
+    tab_table_->Select(table_model_->GetRowForWebContents(
+        browser->tab_strip_model()->GetActiveWebContents()));
+  }
+}
+
 void NewTaskManagerView::RetrieveSavedAlwaysOnTopState() {
   is_always_on_top_ = false;
 
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
     g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_management