Views: Expose an on_closed callback via the MenuRunner constructor.

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

Index: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
index 2c04d3a62225c47c8f21d9491a8853d297950249..c8daa60c0ba1c014ea9dc545fd031ab672e894ec 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -21,7 +21,6 @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
@@ -306,16 +305,13 @@ void MediaGalleriesDialogViews::ShowContextMenuForView(
 void MediaGalleriesDialogViews::ShowContextMenu(const gfx::Point& point,
                                                 ui::MenuSourceType source_type,
                                                 MediaGalleryPrefId id) {
-  menu_model_adapter_.reset(new views::MenuModelAdapter(
+  context_menu_runner_.reset(new views::MenuRunner(
       controller_->GetContextMenu(id),
+      views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU |
+          views::MenuRunner::ASYNC,
       base::Bind(&MediaGalleriesDialogViews::OnMenuClosed,
                  base::Unretained(this))));
 
-  context_menu_runner_.reset(new views::MenuRunner(
-      menu_model_adapter_->CreateMenu(), views::MenuRunner::HAS_MNEMONICS |
-                                             views::MenuRunner::CONTEXT_MENU |
-                                             views::MenuRunner::ASYNC));
-
   context_menu_runner_->RunMenuAt(GetWidget(), NULL,
                                   gfx::Rect(point.x(), point.y(), 0, 0),
                                   views::MENU_ANCHOR_TOPLEFT, source_type);
@@ -326,7 +322,6 @@ bool MediaGalleriesDialogViews::ControllerHasWebContents() const {
 }
 
 void MediaGalleriesDialogViews::OnMenuClosed() {
-  menu_model_adapter_.reset();
   context_menu_runner_.reset();
 }