| Index: chrome/browser/chromeos/status/memory_menu_button.h
|
| diff --git a/chrome/browser/chromeos/status/memory_menu_button.h b/chrome/browser/chromeos/status/memory_menu_button.h
|
| index 7e2c83aa6c01a05563883e1f2c9e7d1b756cdf3e..2802c2690109193c00e195f628430b992001596f 100644
|
| --- a/chrome/browser/chromeos/status/memory_menu_button.h
|
| +++ b/chrome/browser/chromeos/status/memory_menu_button.h
|
| @@ -20,6 +20,7 @@ struct SystemMemoryInfoKB;
|
|
|
| namespace views {
|
| class MenuItemView;
|
| +class MenuRunner;
|
| }
|
|
|
| namespace chromeos {
|
| @@ -58,18 +59,14 @@ class MemoryMenuButton : public StatusAreaButton,
|
| // 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_;
|
|
|
|
|