Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/status/power_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/power_menu_button.h"
 
 #include <algorithm>
 
+#include "base/auto_reset.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // Menu item ids.
 enum {
   POWER_BATTERY_PERCENTAGE_ITEM = 1000,
   POWER_BATTERY_IS_CHARGED_ITEM,
   POWER_NO_BATTERY,
@@ skipping 181 matching lines @@
         text_x, estimate_y, width() - text_x, text_h,
         gfx::Canvas::TEXT_ALIGN_LEFT);
   }
 
   bool OnMousePressed(const views::MouseEvent& event) {
     return true;
   }
 
   void OnMouseReleased(const views::MouseEvent& event) {
     if (event.IsLeftMouseButton()) {
-      DCHECK(menu_button_->menu_);
-      menu_button_->menu_->Cancel();
+      DCHECK(menu_button_->menu_runner_);
+      menu_button_->menu_runner_->Cancel();
     }
   }
 
  private:
   PowerMenuButton* menu_button_;
   gfx::Font percentage_font_;
   gfx::Font estimate_font_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton
 
 PowerMenuButton::PowerMenuButton(StatusAreaHost* host)
     : StatusAreaButton(host, this),
       battery_is_present_(false),
       line_power_on_(false),
       battery_percentage_(0.0),
       battery_index_(-1),
       battery_time_to_full_(TimeDelta::FromMicroseconds(kInitialMS)),
       battery_time_to_empty_(TimeDelta::FromMicroseconds(kInitialMS)),
       status_(NULL),
-      menu_(NULL) {
+      menu_runner_(NULL) {
   UpdateIconAndLabelInfo();
   CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
 }
 
 PowerMenuButton::~PowerMenuButton() {
   CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
 }
 
 // PowerMenuButton, views::MenuDelegate implementation:
 
@@ skipping 51 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, views::View implementation:
 void PowerMenuButton::OnLocaleChanged() {
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, views::ViewMenuDelegate implementation:
 
 void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
-  menu_ = new views::MenuItemView(this);
-  views::MenuItemView* submenu =
-      menu_->AppendMenuItem(
+  views::MenuItemView* menu = new views::MenuItemView(this);
+  // MenuRunner takes ownership of |menu|.
+  views::MenuRunner menu_runner(menu);
+  views::MenuItemView* submenu = menu->AppendMenuItem(
           POWER_BATTERY_PERCENTAGE_ITEM,
           std::wstring(),
           views::MenuItemView::NORMAL);
   status_ = new StatusView(this);
   submenu->AddChildView(status_);
-  menu_->CreateSubmenu()->set_resize_open_menu(true);
-  menu_->SetMargins(0, 0);
+  menu->CreateSubmenu()->set_resize_open_menu(true);
+  menu->SetMargins(0, 0);
   submenu->SetMargins(0, 0);
-  menu_->ChildrenChanged();
+  menu->ChildrenChanged();
 
   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);
-  delete menu_;
+  AutoReset<views::MenuRunner*> menu_runner_reseter(&menu_runner_,
+                                                    &menu_runner);
+  if (menu_runner.RunMenuAt(
+          source->GetWidget()->GetTopLevelWidget(), this, bounds,
+          views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
+      views::MenuRunner::MENU_DELETED)
+    return;
   status_ = NULL;
-  menu_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, PowerLibrary::Observer implementation:
 
 void PowerMenuButton::PowerChanged(PowerLibrary* obj) {
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 61 matching lines @@
   // If previous is 0, then it either was never set (initial condition)
   // or got down to 0.
   if (*previous == TimeDelta::FromMicroseconds(kInitialMS) ||
       diff < kMinDiff ||
       diff > kMaxDiff) {
     *previous = current;
   }
 }
 
 }  // namespace chromeos