Turn TaskManagerView Context Menu Async

chrome/browser/ui/views/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/task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 235 matching lines @@
 }
 
 void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
   if (keycode == ui::VKEY_RETURN)
     ActivateSelectedTab();
 }
 
 void TaskManagerView::ShowContextMenuForView(views::View* source,
                                              const gfx::Point& point,
                                              ui::MenuSourceType source_type) {
-  ui::SimpleMenuModel menu_model(this);
+  menu_model_.reset(new ui::SimpleMenuModel(this));
 
   for (const auto& table_column : columns_) {
-    menu_model.AddCheckItem(table_column.id,
-                            l10n_util::GetStringUTF16(table_column.id));
+    menu_model_->AddCheckItem(table_column.id,
+                              l10n_util::GetStringUTF16(table_column.id));
   }
 
-  menu_runner_.reset(
-      new views::MenuRunner(&menu_model, views::MenuRunner::CONTEXT_MENU));
+  menu_runner_.reset(new views::MenuRunner(
+      menu_model_.get(),
+      views::MenuRunner::CONTEXT_MENU | views::MenuRunner::ASYNC));
 
-  if (menu_runner_->RunMenuAt(GetWidget(), nullptr,
-                              gfx::Rect(point, gfx::Size()),
-                              views::MENU_ANCHOR_TOPLEFT,
-                              source_type) == views::MenuRunner::MENU_DELETED) {
-    return;
-  }
+  menu_runner_->RunMenuAt(GetWidget(), nullptr, gfx::Rect(point, gfx::Size()),
+                          views::MENU_ANCHOR_TOPLEFT, source_type);
 }
 
 bool TaskManagerView::IsCommandIdChecked(int id) const {
   return tab_table_->IsColumnVisible(id);
 }
 
 bool TaskManagerView::IsCommandIdEnabled(int id) const {
   return true;
 }
 
 void TaskManagerView::ExecuteCommand(int id, int event_flags) {
   table_model_->ToggleColumnVisibility(id);
 }
 
+void TaskManagerView::MenuClosed(ui::SimpleMenuModel* source) {
+  if (source != menu_model_.get())

[sky, 2016/08/16 22:33:06]

Is this check necessary?

[jonross, 2016/08/16 23:01:49]

It does not appear to be actually needed. You can't create a new context menu
without first shutting down the active one.

+    return;
+  menu_model_.reset();
+  menu_runner_.reset();
+}
+
 TaskManagerView::TaskManagerView()
     : tab_table_(nullptr),
       tab_table_parent_(nullptr),
       is_always_on_top_(false) {
   Init();
 }
 
 // static
 TaskManagerView* TaskManagerView::GetInstanceForTests() {
   return g_task_manager_view;
@@ skipping 59 matching lines @@
   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_manager