Reland r105450: Linux: add basic bookmark menu support. More features can be added later.

chrome/browser/ui/toolbar/wrench_menu_model.h

Index: chrome/browser/ui/toolbar/wrench_menu_model.h
===================================================================
--- chrome/browser/ui/toolbar/wrench_menu_model.h	(revision 105454)
+++ chrome/browser/ui/toolbar/wrench_menu_model.h	(working copy)
@@ -9,6 +9,7 @@
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
+#include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ui/base/models/accelerator.h"
@@ -70,18 +71,6 @@
   DISALLOW_COPY_AND_ASSIGN(ToolsMenuModel);
 };
 
-class BookmarkSubMenuModel : public ui::SimpleMenuModel {
- public:
-  BookmarkSubMenuModel(ui::SimpleMenuModel::Delegate* delegate,
-                       Browser* browser);
-  virtual ~BookmarkSubMenuModel();
-
- private:
-  void Build(Browser* browser);
-
-  DISALLOW_COPY_AND_ASSIGN(BookmarkSubMenuModel);
-};
-
 // A menu model that builds the contents of the wrench menu.
 class WrenchMenuModel : public ui::SimpleMenuModel,
                         public ui::SimpleMenuModel::Delegate,
@@ -127,6 +116,10 @@
   // Getters.
   Browser* browser() const { return browser_; }
 
+  BookmarkSubMenuModel* bookmark_sub_menu_model() const {
+    return bookmark_sub_menu_model_.get();
+  }
+
   // Calculates |zoom_label_| in response to a zoom change.
   void UpdateZoomControls();