Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1003)

Unified Diff: chrome/browser/ui/panels/panel_browser_frame_view.h

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_browser_frame_view.h
diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.h b/chrome/browser/ui/panels/panel_browser_frame_view.h
index 16b7efaf1c5ef0004c401d6bcfb8e88594ab6a48..fa98d5468e3f9269a679b8c1ef6c157d89e16de7 100644
--- a/chrome/browser/ui/panels/panel_browser_frame_view.h
+++ b/chrome/browser/ui/panels/panel_browser_frame_view.h
@@ -16,6 +16,7 @@
#include "views/controls/button/button.h"
#include "views/controls/menu/menu_item_view.h"
#include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/menu_runner.h"
#include "views/controls/menu/view_menu_delegate.h"
class Extension;
@@ -193,7 +194,9 @@ class PanelBrowserFrameView : public BrowserNonClientFrameView,
scoped_ptr<MouseWatcher> mouse_watcher_;
ui::SimpleMenuModel settings_menu_contents_;
views::MenuModelAdapter settings_menu_adapter_;
- views::MenuItemView settings_menu_;
+ // Owned by |settings_menu_runner_|.
+ views::MenuItemView* settings_menu_;
+ views::MenuRunner settings_menu_runner_;
scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);

Powered by Google App Engine
This is Rietveld 408576698