Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/notifications/balloon_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/chromeos/notifications/balloon_view.h"
 
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/background.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.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/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
 
 namespace {
 // Menu commands
 const int kNoopCommand = 0;
 const int kRevokePermissionCommand = 1;
 
 // Vertical margin between close button and menu button.
 const int kControlButtonsMargin = 6;
@@ skipping 66 matching lines @@
     gfx::Rect total_bounds =
         close_button_->bounds().Union(options_menu_button_->bounds());
     return total_bounds.size();
   }
 
   // views::ViewMenuDelegate implements.
   virtual void RunMenu(views::View* source, const gfx::Point& pt) {
     CreateOptionsMenu();
 
     views::MenuModelAdapter menu_model_adapter(options_menu_contents_.get());
-    views::MenuItemView menu(&menu_model_adapter);
-    menu_model_adapter.BuildMenu(&menu);
+    views::MenuRunner menu_runner(menu_model_adapter.CreateMenu());
 
     gfx::Point screen_location;
     views::View::ConvertPointToScreen(options_menu_button_,
                                       &screen_location);
-    menu.RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
-                   options_menu_button_,
-                   gfx::Rect(screen_location, options_menu_button_->size()),
-                   views::MenuItemView::TOPRIGHT,
-                   true);
+    if (menu_runner.RunMenuAt(
+            source->GetWidget()->GetTopLevelWidget(), options_menu_button_,
+            gfx::Rect(screen_location, options_menu_button_->size()),
+            views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
+        views::MenuRunner::MENU_DELETED)
+      return;
   }
 
   // views::ButtonListener implements.
   virtual void ButtonPressed(views::Button* sender, const views::Event&) {
     balloon_view_->Close(true);
   }
 
   // ui::SimpleMenuModel::Delegate impglements.
   virtual bool IsCommandIdChecked(int /* command_id */) const {
     // Nothing in the menu is checked.
@@ skipping 213 matching lines @@
   service->DenyPermission(balloon_->notification().origin_url());
 }
 
 gfx::NativeView BalloonViewImpl::GetParentNativeView() {
   RenderWidgetHostView* view = html_contents_->render_view_host()->view();
   DCHECK(view);
   return view->GetNativeView();
 }
 
 }  // namespace chromeos