Views: Expose an on_closed callback via the MenuRunner constructor.

ui/views/controls/menu/menu_runner_impl_cocoa.mm

 // Copyright 2014 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.
 
 #import "ui/views/controls/menu/menu_runner_impl_cocoa.h"
 
 #include "base/mac/sdk_forward_declarations.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/events/base_event_utils.h"
@@ skipping 66 matching lines @@
   [anchor_view setHidden:YES];
   [[window contentView] addSubview:anchor_view];
   return anchor_view;
 }
 
 }  // namespace
 
 // static
 MenuRunnerImplInterface* MenuRunnerImplInterface::Create(
     ui::MenuModel* menu_model,
-    int32_t run_types) {
+    int32_t run_types,
+    const base::Closure& on_menu_closed_callback) {
   if ((run_types & kNativeRunTypes) != 0 &&
       (run_types & MenuRunner::IS_NESTED) == 0) {
-    return new MenuRunnerImplCocoa(menu_model);
+    return new MenuRunnerImplCocoa(menu_model, on_menu_closed_callback);
   }
 
-  return new MenuRunnerImplAdapter(menu_model);
+  return new MenuRunnerImplAdapter(menu_model, on_menu_closed_callback);
 }
 
-MenuRunnerImplCocoa::MenuRunnerImplCocoa(ui::MenuModel* menu)
+MenuRunnerImplCocoa::MenuRunnerImplCocoa(
+    ui::MenuModel* menu,
+    const base::Closure& on_menu_closed_callback)
     : running_(false),
       delete_after_run_(false),
-      closing_event_time_(base::TimeTicks()) {
+      closing_event_time_(base::TimeTicks()),
+      on_menu_closed_callback_(on_menu_closed_callback) {
   menu_controller_.reset(
       [[MenuController alloc] initWithModel:menu useWithPopUpButtonCell:NO]);
 }
 
 bool MenuRunnerImplCocoa::IsRunning() const {
   return running_;
 }
 
 void MenuRunnerImplCocoa::Release() {
   if (IsRunning()) {
@@ skipping 37 matching lines @@
   }
 
   closing_event_time_ = ui::EventTimeForNow();
   running_ = false;
 
   if (delete_after_run_) {
     delete this;
     return MenuRunner::MENU_DELETED;
   }
 
+  // Don't invoke the callback if Release() was called, since that usually means
+  // the owning instance is being destroyed.
+  if (!on_menu_closed_callback_.is_null())
+    on_menu_closed_callback_.Run();
+
   return MenuRunner::NORMAL_EXIT;
 }
 
 void MenuRunnerImplCocoa::Cancel() {
   [menu_controller_ cancel];
 }
 
 base::TimeTicks MenuRunnerImplCocoa::GetClosingEventTime() const {
   return closing_event_time_;
 }
 
 MenuRunnerImplCocoa::~MenuRunnerImplCocoa() {
 }
 
 }  // namespace internal
 }  // namespace views