Change MenuControllerDelegate to provide WeakPtr

ui/views/controls/menu/menu_runner_impl.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_runner_impl.h"
 
 #include "build/build_config.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ skipping 18 matching lines @@
 }
 #endif
 
 MenuRunnerImpl::MenuRunnerImpl(MenuItemView* menu)
     : menu_(menu),
       running_(false),
       delete_after_run_(false),
       async_(false),
       for_drop_(false),
       controller_(NULL),
-      owns_controller_(false),
-      weak_factory_(this) {}
+      owns_controller_(false) {}
 
 bool MenuRunnerImpl::IsRunning() const {
   return running_;
 }
 
 void MenuRunnerImpl::Release() {
   if (running_) {
     if (delete_after_run_)
       return;  // We already canceled.
 
@@ skipping 144 matching lines @@
   // Make sure all the windows we created to show the menus have been
   // destroyed.
   menu_->DestroyAllMenuHosts();
   if (delete_after_run_) {
     delete this;
     return MenuRunner::MENU_DELETED;
   }
   running_ = false;
   if (menu_->GetDelegate()) {
     // Executing the command may also delete this.
-    base::WeakPtr<MenuRunnerImpl> ref(weak_factory_.GetWeakPtr());
+    base::WeakPtr<MenuControllerDelegate> ref(AsWeakPtr());
     if (result && !for_drop_) {
       // Do not execute the menu that was dragged/dropped.
       menu_->GetDelegate()->ExecuteCommand(result->GetCommand(),
                                            mouse_event_flags);
     }
     // Only notify the delegate if it did not delete this.
     if (!ref)
       return MenuRunner::MENU_DELETED;
     else if (type == NOTIFY_DELEGATE)
       menu_->GetDelegate()->OnMenuClosed(result, MenuRunner::NORMAL_EXIT);
   }
   return MenuRunner::NORMAL_EXIT;
 }
 
 bool MenuRunnerImpl::ShouldShowMnemonics(MenuButton* button) {
   // Show mnemonics if the button has focus or alt is pressed.
   bool show_mnemonics = button ? button->HasFocus() : false;
 #if defined(OS_WIN)
   // This is only needed on Windows.
   if (!show_mnemonics)
     show_mnemonics = ui::win::IsAltPressed();
 #endif
   return show_mnemonics;
 }
 
 }  // namespace internal
 }  // namespace views