Makes views show the 'mobile' bookmark folder where appropriate.

chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.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_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 20 matching lines @@
 
 // BookmarkMenuDelegate acts as the (informal) views::MenuDelegate for showing
 // bookmarks in a MenuItemView. BookmarkMenuDelegate informally implements
 // MenuDelegate as its assumed another class is going to forward the appropriate
 // methods to this class. Doing so allows this class to be used for both menus
 // on the bookmark bar and the bookmarks in the wrench menu.
 class BookmarkMenuDelegate : public BaseBookmarkModelObserver,
                              public BookmarkContextMenuObserver {
  public:
   enum ShowOptions {
-    // Indicates a menu should be added containing the 'other' bookmarks folder
-    // and all its contents. This only makes sense when showing the contents
-    // of the bookmark folder.
-    SHOW_OTHER_FOLDER,
+    // Indicates a menu should be added containing the permanent folders (other
+    // than then bookmark bar folder). This only makes sense when showing the
+    // contents of the bookmark bar folder.
+    SHOW_PERMANENT_FOLDERS,
 
-    // Don't show the 'other' bookmarks folder.
-    HIDE_OTHER_FOLDER
+    // Don't show any additional folders.
+    HIDE_PERMANENT_FOLDERS
   };
 
   BookmarkMenuDelegate(Profile* profile,
                        PageNavigator* navigator,
                        views::Widget* parent,
                        int first_menu_id);
   virtual ~BookmarkMenuDelegate();
 
   // Creates the menus from the model.
   void Init(views::MenuDelegate* real_delegate,
@@ skipping 69 matching lines @@
   typedef std::map<int, const BookmarkNode*> MenuIDToNodeMap;
   typedef std::map<const BookmarkNode*, int> NodeToMenuIDMap;
   typedef std::map<const BookmarkNode*, views::MenuItemView*> NodeToMenuMap;
 
   // Creates a menu and adds it to node_to_menu_id_map_. This uses
   // BuildMenu to recursively populate the menu.
   views::MenuItemView* CreateMenu(const BookmarkNode* parent,
                                   int start_child_index,
                                   ShowOptions show_options);
 
-  // Builds the menu for the other bookmarks folder. This is added as the last
-  // item to menu_.
-  void BuildOtherFolderMenu(views::MenuItemView* menu, int* next_menu_id);
+  // Invokes BuildMenuForPermanentNode() for the permanent nodes (excluding
+  // 'other bookmarks' folder).
+  void BuildMenusForPermanentNodes(views::MenuItemView* menu,
+                                   int* next_menu_id);
+
+  // If |node| has children a new menu is created and added to |menu| to
+  // represent it. If |node| is not empty and |added_separator| is false, a
+  // separator is added before the new menu items and |added_separator| is set
+  // to true.
+  void BuildMenuForPermanentNode(const BookmarkNode* node,
+                                 views::MenuItemView* menu,
+                                 int* next_menu_id,
+                                 bool* added_separator);
 
   // Creates an entry in menu for each child node of |parent| starting at
   // |start_child_index|.
   void BuildMenu(const BookmarkNode* parent,
                  int start_child_index,
                  views::MenuItemView* menu,
                  int* next_menu_id);
 
   // Returns the menu whose id is |id|.
   views::MenuItemView* GetMenuByID(int id);
@@ skipping 38 matching lines @@
   // Is the model being changed?
   bool is_mutating_model_;
 
   // The location where this bookmark menu will be displayed (for UMA).
   bookmark_utils::BookmarkLaunchLocation location_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_