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

chrome/browser/ui/toolbar/wrench_menu_model.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
 #pragma once
 
 #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"
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
 class TabStripModel;
 
 namespace {
@@ skipping 41 matching lines @@
   virtual ~ToolsMenuModel();
 
  private:
   void Build(Browser* browser);
 
   scoped_ptr<EncodingMenuModel> encoding_menu_model_;
 
   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,
                         public ui::ButtonMenuItemModel::Delegate,
                         public TabStripModelObserver,
                         public NotificationObserver {
  public:
   WrenchMenuModel(ui::AcceleratorProvider* provider, Browser* browser);
   virtual ~WrenchMenuModel();
 
@@ skipping 25 matching lines @@
   virtual void TabStripModelDeleted() OVERRIDE;
 
   // Overridden from NotificationObserver:
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // 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();
 
  private:
   // Testing constructor used for mocking.
   friend class ::MockWrenchMenuModel;
   WrenchMenuModel();
 
   void Build();
 
@@ skipping 23 matching lines @@
 
   Browser* browser_;  // weak
   TabStripModel* tabstrip_model_; // weak
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_