Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/views/infobars/extension_infobar.cc

 // Copyright (c) 2011 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/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 
 // ExtensionInfoBarDelegate ----------------------------------------------------
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
   return new ExtensionInfoBar(owner, this);
 }
 
 // ExtensionInfoBar ------------------------------------------------------------
 
@@ skipping 109 matching lines @@
   const Extension* extension = GetDelegate()->extension_host()->extension();
   if (!extension->ShowConfigureContextMenus())
     return;
 
   Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
       platform_util::GetTopLevel(source->GetWidget()->GetNativeView()))->
       browser();
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser, NULL);
   views::MenuModelAdapter options_menu_delegate(options_menu_contents.get());
-  views::MenuItemView options_menu(&options_menu_delegate);
-  options_menu_delegate.BuildMenu(&options_menu);
+  views::MenuRunner options_menu_runner(options_menu_delegate.CreateMenu());
 
   gfx::Point screen_point;
   views::View::ConvertPointToScreen(menu_, &screen_point);
-  options_menu.RunMenuAt(GetWidget(), menu_,
-      gfx::Rect(screen_point, menu_->size()), views::MenuItemView::TOPLEFT,
-      true);
+  if (options_menu_runner.RunMenuAt(GetWidget(), menu_,
+          gfx::Rect(screen_point, menu_->size()), views::MenuItemView::TOPLEFT,
+          views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
+    return;
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }