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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu.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/views/bookmarks/bookmark_context_menu.h
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
index de732d12793afe3240e9032e9da474b232df056f..064eb0d32314f985291180d26bb4335846c98ead 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
@@ -10,6 +10,7 @@
#include "views/controls/menu/menu_delegate.h"
namespace views {
+class MenuRunner;
class Widget;
}
@@ -42,7 +43,7 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerViewsDelegate,
// Shows the context menu at the specified point.
void RunMenuAt(const gfx::Point& point);
- views::MenuItemView* menu() const { return menu_.get(); }
+ views::MenuItemView* menu() const { return menu_; }
void set_observer(BookmarkContextMenuObserver* observer) {
observer_ = observer;
@@ -69,8 +70,11 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerViewsDelegate,
// The parent of dialog boxes opened from the context menu.
views::Widget* parent_widget_;
- // The menu itself.
- scoped_ptr<views::MenuItemView> menu_;
+ // The menu itself. This is owned by |menu_runner_|.
+ views::MenuItemView* menu_;
+
+ // Responsible for running the menu.
+ scoped_ptr<views::MenuRunner> menu_runner_;
// The node we're showing the menu for.
const BookmarkNode* parent_node_;

Powered by Google App Engine
This is Rietveld 408576698