Makes it so that when a folder is open on the bookmark bar and the...

chrome/browser/views/bookmark_menu_controller_views.h

 // Copyright (c) 2009 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_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
 
 #include <map>
 
 #include "app/gfx/native_widget_types.h"
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/views/bookmark_context_menu.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
 
 namespace gfx {
 class Rect;
-}
+}  // namespace gfx
 
+namespace views {
+class MenuButton;
+}  // namespace views
+
+class BookmarkBarView;
 class BookmarkContextMenu;
 class BookmarkNode;
 class Browser;
 class OSExchangeData;
 class PageNavigator;
 class Profile;
 
 // BookmarkMenuController is responsible for showing a menu of bookmarks,
 // each item in the menu represents a bookmark.
 // BookmarkMenuController deletes itself as necessary, although the menu can
@@ skipping 10 matching lines @@
   // Creates a BookmarkMenuController showing the children of |node| starting
   // at index |start_child_index|.
   BookmarkMenuController(Browser* browser,
                          Profile* profile,
                          PageNavigator* page_navigator,
                          gfx::NativeWindow parent,
                          const BookmarkNode* node,
                          int start_child_index,
                          bool show_other_folder);
 
+  void RunMenuAt(BookmarkBarView* bookmark_bar, bool for_drop);
+
   // Shows the menu.
-  void RunMenuAt(const gfx::Rect& bounds,
+  void RunMenuAt(views::MenuButton* button,
                  views::MenuItemView::AnchorPosition position,
                  bool for_drop);
 
   // Hides the menu.
   void Cancel();
 
   // Returns the node the menu is showing for.
   const BookmarkNode* node() const { return node_; }
 
   // Returns the menu.
-  views::MenuItemView* menu() const { return menu_.get(); }
+  views::MenuItemView* menu() const { return menu_; }
 
   // Returns the context menu, or NULL if the context menu isn't showing.
   views::MenuItemView* context_menu() const {
     return context_menu_.get() ? context_menu_->menu() : NULL;
   }
 
   void set_observer(Observer* observer) { observer_ = observer; }
 
   // MenuDelegate methods.
   virtual bool IsTriggerableEvent(const views::MouseEvent& e);
@@ skipping 12 matching lines @@
                             const views::DropTargetEvent& event);
   virtual bool ShowContextMenu(views::MenuItemView* source,
                                int id,
                                int x,
                                int y,
                                bool is_mouse_gesture);
   virtual void DropMenuClosed(views::MenuItemView* menu);
   virtual bool CanDrag(views::MenuItemView* menu);
   virtual void WriteDragData(views::MenuItemView* sender, OSExchangeData* data);
   virtual int GetDragOperations(views::MenuItemView* sender);
+  virtual views::MenuItemView* GetSiblingMenu(
+      views::MenuItemView* menu,
+      const gfx::Point& screen_point,
+      views::MenuItemView::AnchorPosition* anchor,
+      bool* has_mnemonics,
+      views::MenuButton** button);
 
+  // BookmarkModelObserver methods.
   virtual void BookmarkModelChanged();
   virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
 
  private:
   // BookmarkMenuController deletes itself as necessary.
   ~BookmarkMenuController();
 
+  // 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);
+
   // Builds the menu for the other bookmarks folder. This is added as the last
   // item to menu_.
-  void BuildOtherFolderMenu(int* next_menu_id);
+  void BuildOtherFolderMenu(views::MenuItemView* menu, int* next_menu_id);
 
   // 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);
 
   Browser* browser_;
 
   Profile* profile_;
 
   PageNavigator* page_navigator_;
 
   // Parent of menus.
   gfx::NativeWindow parent_;
 
   // The node we're showing the contents of.
   const BookmarkNode* node_;
 
   // Maps from menu id to BookmarkNode.
   std::map<int, const BookmarkNode*> menu_id_to_node_map_;
 
   // Mapping from node to menu id. This only contains entries for nodes of type
   // URL.
   std::map<const BookmarkNode*, int> node_to_menu_id_map_;
 
-  // The menu.
-  scoped_ptr<views::MenuItemView> menu_;
+  // Current menu.
+  views::MenuItemView* menu_;
 
   // Data for the drop.
   BookmarkDragData drop_data_;
 
   // Used when a context menu is shown.
   scoped_ptr<BookmarkContextMenu> context_menu_;
 
   // The observer, may be null.
   Observer* observer_;
 
   // Is the menu being shown for a drop?
   bool for_drop_;
 
   // Should the other folder be shown?
   bool show_other_folder_;
 
+  // The bookmark bar. This is only non-null if we're showing a menu item
+  // for a folder on the bookmark bar and not for drop.
+  BookmarkBarView* bookmark_bar_;
+
+  typedef std::map<const BookmarkNode*, views::MenuItemView*> NodeToMenuMap;
+  NodeToMenuMap node_to_menu_map_;
+
+  // ID of the next menu item.
+  int next_menu_id_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_