Make BookmarkContextMenuGtk use a SimpleMenuModel. Also separate controller and view responsibilities.

This is the first step in re-merging bookmark context menus across platforms.

BUG=32830
TEST=manual

Review URL: http://codereview.chromium.org/555142

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37364 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.h b/chrome/browser/gtk/bookmark_menu_controller_gtk.h
index dbd0c3e..fdf098a 100644
--- a/chrome/browser/gtk/bookmark_menu_controller_gtk.h
+++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.h
@@ -21,6 +21,7 @@ class Profiler;
 class PageNavigator;
 class BookmarkModel;
 class BookmarkNode;
+class MenuGtk;
 
 class BookmarkMenuController : public BaseBookmarkModelObserver,
                                public BookmarkContextMenuGtk::Delegate {
@@ -123,8 +124,9 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   // nodes of type URL.
   std::map<const BookmarkNode*, GtkWidget*> node_to_menu_widget_map_;
 
-  // Owns our right click context menu.
-  scoped_ptr<BookmarkContextMenuGtk> context_menu_;
+  // The controller and view for the right click context menu.
+  scoped_ptr<BookmarkContextMenuGtk> context_menu_controller_;
+  scoped_ptr<MenuGtk> context_menu_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);
 };