Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/frame/browser_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/frame/browser_view.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 23 matching lines @@
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/hit_test.h"
 
 namespace {
 
 // Amount to offset the toolbar by when vertical tabs are enabled.
 const int kVerticalTabStripToolbarOffset = 2;
 // Amount to tweak the position of the status area to get it to look right.
 const int kStatusAreaVerticalAdjustment = -1;
@@ skipping 450 matching lines @@
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
   // - HTNOWHERE: as the name implies.
   gfx::Point point_in_parent_coords(p);
   views::View::ConvertPointToView(NULL, parent(), &point_in_parent_coords);
   int hit_test = NonClientHitTest(point_in_parent_coords);
   if (hit_test == HTCAPTION || hit_test == HTNOWHERE) {
     // rebuild menu so it reflects current application state
     InitSystemMenu();
-    system_menu_->RunMenuAt(source->GetWidget(), NULL,
-                            gfx::Rect(p, gfx::Size(0,0)),
-                            views::MenuItemView::TOPLEFT,
-                            true);
+    if (system_menu_runner_->RunMenuAt(source->GetWidget(), NULL,
+            gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT,
+            views::MenuRunner::HAS_MNEMONICS) ==
+        views::MenuRunner::MENU_DELETED)
+      return;
   }
 }
 
 // BrowserView, views::MenuListener implementation.
 void BrowserView::OnMenuOpened() {
   // Save the focused widget before wrench menu opens.
   saved_focused_widget_ = gtk_window_get_focus(GetNativeHandle());
 }
 
 // BrowserView, BrowserList::Observer implementation.
@@ skipping 85 matching lines @@
 
 void BrowserView::GetAccessiblePanes(
     std::vector<AccessiblePaneView*>* panes) {
   ::BrowserView::GetAccessiblePanes(panes);
   panes->push_back(status_area_);
 }
 
 // BrowserView private.
 
 void BrowserView::InitSystemMenu() {
-  system_menu_.reset(new views::MenuItemView(system_menu_delegate_.get()));
-  system_menu_->AppendDelegateMenuItem(IDC_RESTORE_TAB);
-
-  system_menu_->AppendMenuItemWithLabel(
+  views::MenuItemView* menu =
+      new views::MenuItemView(system_menu_delegate_.get());
+  // MenuRunner takes ownership of menu.
+  system_menu_runner_.reset(new views::MenuRunner(menu));
+  menu->AppendDelegateMenuItem(IDC_RESTORE_TAB);
+  menu->AppendMenuItemWithLabel(
       IDC_NEW_TAB,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_TAB)));
-  system_menu_->AppendSeparator();
-  system_menu_->AppendMenuItemWithLabel(
+  menu->AppendSeparator();
+  menu->AppendMenuItemWithLabel(
       IDC_TASK_MANAGER,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_TASK_MANAGER)));
 }
 
 void BrowserView::FetchHideStatusAreaProperty() {
   std::set<WmIpc::AtomType> state_atoms;
   if (WmIpc::instance()->GetWindowState(
           GTK_WIDGET(frame()->GetNativeWindow()), &state_atoms)) {
     if (state_atoms.count(WmIpc::ATOM_CHROME_STATE_STATUS_HIDDEN)) {
       has_hide_status_area_property_ = true;
@@ skipping 24 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->is_type_popup() || browser->is_type_panel())
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }