Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/status/memory_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/memory_menu_button.h"
 
 #include "base/file_util.h"
 #include "base/process_util.h"  // GetSystemMemoryInfo
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/memory_purger.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"
 #endif
 
 #if defined(USE_TCMALLOC)
 const char kProfileDumpFilePrefix[] = "/tmp/chrome_tcmalloc";
 #endif
 
@@ skipping 176 matching lines @@
 int MemoryMenuButton::horizontal_padding() {
   return 3;
 }
 
 // MemoryMenuButton, views::ViewMenuDelegate implementation:
 
 void MemoryMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   // View passed in must be a views::MenuButton, i.e. the MemoryMenuButton.
   DCHECK_EQ(source, this);
 
-  EnsureMenu();
-
+  views::MenuRunner menu_runner(CreateMenu());
   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;
 }
 
-// MemoryMenuButton, views::View implementation:
-
-void MemoryMenuButton::EnsureMenu() {
+views::MenuItemView* MemoryMenuButton::CreateMenu() {
   // Just rebuild the menu each time to ensure the labels are up-to-date.
-  menu_.reset(new views::MenuItemView(this));
+  views::MenuItemView* menu = new views::MenuItemView(this);
   // Text for these items will be set by GetLabel().
-  menu_->AppendDelegateMenuItem(MEM_TOTAL_ITEM);
-  menu_->AppendDelegateMenuItem(MEM_FREE_ITEM);
-  menu_->AppendDelegateMenuItem(MEM_BUFFERS_ITEM);
-  menu_->AppendDelegateMenuItem(MEM_CACHE_ITEM);
-  menu_->AppendDelegateMenuItem(SHMEM_ITEM);
-  menu_->AppendSeparator();
-  menu_->AppendDelegateMenuItem(PURGE_MEMORY_ITEM);
+  menu->AppendDelegateMenuItem(MEM_TOTAL_ITEM);
+  menu->AppendDelegateMenuItem(MEM_FREE_ITEM);
+  menu->AppendDelegateMenuItem(MEM_BUFFERS_ITEM);
+  menu->AppendDelegateMenuItem(MEM_CACHE_ITEM);
+  menu->AppendDelegateMenuItem(SHMEM_ITEM);
+  menu->AppendSeparator();
+  menu->AppendDelegateMenuItem(PURGE_MEMORY_ITEM);
 #if defined(USE_TCMALLOC)
-  menu_->AppendSeparator();
-  menu_->AppendDelegateMenuItem(TOGGLE_PROFILING_ITEM);
+  menu->AppendSeparator();
+  menu->AppendDelegateMenuItem(TOGGLE_PROFILING_ITEM);
   if (IsHeapProfilerRunning())
-    menu_->AppendDelegateMenuItem(DUMP_PROFILING_ITEM);
+    menu->AppendDelegateMenuItem(DUMP_PROFILING_ITEM);
 #endif
+  return menu;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // NotificationObserver overrides.
 
 void MemoryMenuButton::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       RenderProcessHost::RendererClosedDetails* process_details =
           Details<RenderProcessHost::RendererClosedDetails>(details).ptr();
       if (process_details->status ==
           base::TERMINATION_STATUS_PROCESS_WAS_KILLED) {
         renderer_kills_++;
         // A kill is a very interesting event, so repaint immediately.
         UpdateText();
       }
       break;
     }
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }
 
 }  // namespace chromeos