Views: Expose an on_closed callback via the MenuRunner constructor.

chrome/browser/ui/views/frame/browser_frame.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/ui/views/frame/browser_frame.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/font_list.h"
-#include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/session/session_state_delegate.h"  // nogncheck
 #include "ash/common/wm_shell.h"  // nogncheck
 #include "ui/native_theme/native_theme_dark_aura.h"  // nogncheck
 #endif
 
 #if defined(OS_LINUX)
@@ skipping 211 matching lines @@
     return;
 
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
   // - HTNOWHERE: as the name implies.
   gfx::Point point_in_view_coords(p);
   views::View::ConvertPointFromScreen(non_client_view(), &point_in_view_coords);
   int hit_test = non_client_view()->NonClientHitTest(point_in_view_coords);
   if (hit_test == HTCAPTION || hit_test == HTNOWHERE) {
-    menu_model_adapter_.reset(new views::MenuModelAdapter(
+    menu_runner_.reset(new views::MenuRunner(
         GetSystemMenuModel(),
+        views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU |
+            views::MenuRunner::ASYNC,
         base::Bind(&BrowserFrame::OnMenuClosed, base::Unretained(this))));
-    menu_runner_.reset(new views::MenuRunner(
-        menu_model_adapter_->CreateMenu(), views::MenuRunner::HAS_MNEMONICS |
-                                               views::MenuRunner::CONTEXT_MENU |
-                                               views::MenuRunner::ASYNC));
     menu_runner_->RunMenuAt(source->GetWidget(), nullptr,
                             gfx::Rect(p, gfx::Size(0, 0)),
                             views::MENU_ANCHOR_TOPLEFT, source_type);
   }
 }
 
 ui::MenuModel* BrowserFrame::GetSystemMenuModel() {
 #if defined(OS_CHROMEOS)
   ash::SessionStateDelegate* delegate =
       ash::WmShell::Get()->GetSessionStateDelegate();
@@ skipping 11 matching lines @@
     menu_model_builder_->Init();
   }
   return menu_model_builder_->menu_model();
 }
 
 views::View* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->GetProfileSwitcherView();
 }
 
 void BrowserFrame::OnMenuClosed() {
-  menu_model_adapter_.reset();
   menu_runner_.reset();
 }