Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/status/clock_menu_button.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/status/clock_menu_button.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 #include "unicode/datefmt.h"
 
 namespace {
 
 // views::MenuItemView item ids
 enum {
   CLOCK_DISPLAY_ITEM,
   CLOCK_OPEN_OPTIONS_ITEM
 };
@@ skipping 115 matching lines @@
 
 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   // View passed in must be a views::MenuButton, i.e. the ClockMenuButton.
   DCHECK_EQ(source, this);
 
   EnsureMenu();
 
   gfx::Point screen_location;
   views::View::ConvertPointToScreen(source, &screen_location);
   gfx::Rect bounds(screen_location, source->size());
-  menu_->RunMenuAt(
-      source->GetWidget()->GetTopLevelWidget(),
-      this,
-      bounds,
-      views::MenuItemView::TOPRIGHT,
-      true);
+  if (menu_runner_->RunMenuAt(
+          source->GetWidget()->GetTopLevelWidget(), this, bounds,
+          views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
+      views::MenuRunner::MENU_DELETED)
+    return;
 }
 
 // ClockMenuButton, views::View implementation:
 
 void ClockMenuButton::OnLocaleChanged() {
   UpdateText();
 }
 
 void ClockMenuButton::EnsureMenu() {
-  if (!menu_.get()) {
-    menu_.reset(new views::MenuItemView(this));
+  if (menu_runner_.get())
+    return;
 
-    // Text for this item will be set by GetLabel().
-    menu_->AppendDelegateMenuItem(CLOCK_DISPLAY_ITEM);
+  views::MenuItemView* menu = new views::MenuItemView(this);
+  // menu_runner_ takes ownership of menu.
+  menu_runner_.reset(new views::MenuRunner(menu));
 
-    // If options dialog is unavailable, don't show a separator and configure
-    // menu item.
-    if (host_->ShouldOpenButtonOptions(this)) {
-      menu_->AppendSeparator();
+  // Text for this item will be set by GetLabel().
+  menu->AppendDelegateMenuItem(CLOCK_DISPLAY_ITEM);
 
-      const string16 clock_open_options_label =
-          l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
-      menu_->AppendMenuItemWithLabel(
-          CLOCK_OPEN_OPTIONS_ITEM,
-          UTF16ToWide(clock_open_options_label));
-    }
+  // If options dialog is unavailable, don't show a separator and configure
+  // menu item.
+  if (host_->ShouldOpenButtonOptions(this)) {
+    menu->AppendSeparator();
+
+    const string16 clock_open_options_label =
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
+    menu->AppendMenuItemWithLabel(
+        CLOCK_OPEN_OPTIONS_ITEM,
+        UTF16ToWide(clock_open_options_label));
   }
 }
 
 }  // namespace chromeos