Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/status/memory_menu_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_MEMORY_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_MEMORY_MENU_BUTTON_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
 namespace base {
 struct SystemMemoryInfoKB;
 }
 
 namespace views {
 class MenuItemView;
+class MenuRunner;
 }
 
 namespace chromeos {
 
 class StatusAreaHost;
 
 // Memory debugging display that lives in the status area.
 class MemoryMenuButton : public StatusAreaButton,
                          public views::MenuDelegate,
                          public views::ViewMenuDelegate,
@@ skipping 18 matching lines @@
   // Updates the text on the menu button.
   void UpdateText();
 
  protected:
   virtual int horizontal_padding() OVERRIDE;
 
  private:
   // Execute command id for each renderer. Used for heap profiling.
   void SendCommandToRenderers(int id);
 
-  // Create and initialize menu if not already present.
-  void EnsureMenu();
+  // Creates and returns the menu. The caller owns the returned value.
+  views::MenuItemView* CreateMenu();
 
   // Updates text and schedules the timer to fire at the next minute interval.
   void UpdateTextAndSetNextTimer();
 
   base::OneShotTimer<MemoryMenuButton> timer_;
 
-  // NOTE: we use a scoped_ptr here as menu calls into 'this' from the
-  // constructor.
-  scoped_ptr<views::MenuItemView> menu_;
-
   // Raw data from /proc/meminfo
   scoped_ptr<base::SystemMemoryInfoKB> meminfo_;
 
   NotificationRegistrar registrar_;
 
   // Number of renderer kills we have observed.
   int renderer_kills_;
 
   DISALLOW_COPY_AND_ASSIGN(MemoryMenuButton);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_MEMORY_MENU_BUTTON_H_