Adds a bookmark menu. This is experimental. To turn on you need

--bookmark-menu.

BUG=3206
TEST=Turn on the bookmark menu via --bookmark-menu and make sure it
  works. Also make sure I didn't break anything on the bookmark bar.

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

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

1 files changed, 9 insertions, 1 deletions

diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.h b/chrome/browser/bookmarks/bookmark_menu_controller.h
index 71d3a74..96bce0e 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller.h
+++ b/chrome/browser/bookmarks/bookmark_menu_controller.h
@@ -39,7 +39,8 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
                          PageNavigator* page_navigator,
                          HWND hwnd,
                          BookmarkNode* node,
-                         int start_child_index);
+                         int start_child_index,
+                         bool show_other_folder);
 
   // Shows the menu.
   void RunMenuAt(const gfx::Rect& bounds,
@@ -90,6 +91,10 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   // BookmarkMenuController deletes itself as necessary.
   ~BookmarkMenuController();
 
+  // Builds the menu for the other bookmarks folder. This is added as the last
+  // item to menu_.
+  void BuildOtherFolderMenu(int* next_menu_id);
+
   // Creates an entry in menu for each child node of |parent| starting at
   // |start_child_index|.
   void BuildMenu(BookmarkNode* parent,
@@ -131,6 +136,9 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   // Is the menu being shown for a drop?
   bool for_drop_;
 
+  // Should the other folder be shown?
+  bool show_other_folder_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);
 };