Views: Expose an on_closed callback via the MenuRunner constructor.

chrome/browser/ui/views/frame/browser_frame.cc

Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index 2cbb1850d2cc9227c5a68f16dd03fb9444b420f8..ccacf48282c2b1f77520f70a0e7b5cba9a9ebd45 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -28,7 +28,6 @@
 #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"
 
@@ -260,13 +259,11 @@ void BrowserFrame::ShowContextMenuForView(views::View* source,
   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);
@@ -298,6 +295,5 @@ views::View* BrowserFrame::GetNewAvatarMenuButton() {
 }
 
 void BrowserFrame::OnMenuClosed() {
-  menu_model_adapter_.reset();
   menu_runner_.reset();
 }