Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/panels/panel_browser_frame_view.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/panels/panel_browser_frame_view.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ skipping 196 matching lines @@
       frame_(frame),
       browser_view_(browser_view),
       paint_state_(NOT_PAINTED),
       settings_button_(NULL),
       is_settings_button_visible_(false),
       close_button_(NULL),
       title_icon_(NULL),
       title_label_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(settings_menu_contents_(this)),
       settings_menu_adapter_(&settings_menu_contents_),
-      settings_menu_(&settings_menu_adapter_) {
+      settings_menu_(new views::MenuItemView(&settings_menu_adapter_)),
+      settings_menu_runner_(settings_menu_) {
   EnsureResourcesInitialized();
   frame_->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
 
   settings_button_ =  new views::MenuButton(NULL, std::wstring(), this, false);
   settings_button_->SetIcon(*(settings_button_resources.normal_image));
   settings_button_->SetHoverIcon(*(settings_button_resources.hover_image));
   settings_button_->SetPushedIcon(*(settings_button_resources.pushed_image));
   settings_button_->set_alignment(views::TextButton::ALIGN_CENTER);
   settings_button_->set_border(NULL);
   settings_button_->SetTooltipText(
@@ skipping 207 matching lines @@
   if (sender == close_button_)
     frame_->Close();
 }
 
 void PanelBrowserFrameView::RunMenu(View* source, const gfx::Point& pt) {
   EnsureSettingsMenuCreated();
 
   DCHECK_EQ(settings_button_, source);
   gfx::Point screen_point;
   views::View::ConvertPointToScreen(source, &screen_point);
-  settings_menu_.RunMenuAt(source->GetWidget(),
-      settings_button_, gfx::Rect(screen_point, source->size()),
-      views::MenuItemView::TOPRIGHT, true);
+  if (settings_menu_runner_.RunMenuAt(source->GetWidget(),
+          settings_button_, gfx::Rect(screen_point, source->size()),
+          views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
+      views::MenuRunner::MENU_DELETED)
+    return;
 }
 
 bool PanelBrowserFrameView::IsCommandIdChecked(int command_id) const {
   // Nothing in the menu is checked.
   return false;
 }
 
 bool PanelBrowserFrameView::IsCommandIdEnabled(int command_id) const {
   const Extension* extension = GetExtension();
   if (!extension)
@@ skipping 285 matching lines @@
   settings_menu_contents_.AddItem(
       COMMAND_CONFIGURE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS));
   settings_menu_contents_.AddItem(
       COMMAND_DISABLE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE));
   settings_menu_contents_.AddItem(
       COMMAND_UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL));
   settings_menu_contents_.AddSeparator();
   settings_menu_contents_.AddItem(
       COMMAND_MANAGE, l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS));
 
-  settings_menu_adapter_.BuildMenu(&settings_menu_);
+  settings_menu_adapter_.BuildMenu(settings_menu_);
 }