Open the WrenchMenu on mouseover when dragging a browser action

chrome/browser/ui/views/toolbar/wrench_menu.h

 // Copyright 2013 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_TOOLBAR_WRENCH_MENU_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
 
 #include <map>
 #include <utility>
 
@@ skipping 19 matching lines @@
 class MenuItemView;
 class MenuRunner;
 class View;
 }  // namespace views
 
 // WrenchMenu adapts the WrenchMenuModel to view's menu related classes.
 class WrenchMenu : public views::MenuDelegate,
                    public BaseBookmarkModelObserver,
                    public content::NotificationObserver {
  public:
+  // |for_drop| indicates whether or not the menu is being opened for a
+  // drag-and-drop operation.
   // TODO: remove |use_new_menu| and |supports_new_separators|.
   WrenchMenu(Browser* browser,
              bool use_new_menu,

[sky, 2014/07/18 19:36:54]

I think it's time to convert to a bitmask here.

[Devlin, 2014/07/18 21:38:31]

Done.

-             bool supports_new_separators);
+             bool supports_new_separators,
+             bool for_drop);
   virtual ~WrenchMenu();
 
   void Init(ui::MenuModel* model);
 
   // Shows the menu relative to the specified view.
   void RunMenu(views::MenuButton* host);
 
+  // Closes the menu if it is open, otherwise does nothing.
+  void CloseMenu();

[sky, 2014/07/18 19:36:54]

Instead of the close can you just delete this object?

[Devlin, 2014/07/18 21:38:31]

Nope - doing so causes a segfault.

+
   // Whether the menu is currently visible to the user.
   bool IsShowing();
 
   bool use_new_menu() const { return use_new_menu_; }
+  bool for_drop() const { return for_drop_; }
 
   void AddObserver(WrenchMenuObserver* observer);
   void RemoveObserver(WrenchMenuObserver* observer);
 
   // MenuDelegate overrides:
   virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE;
   virtual bool GetShouldUseDisabledEmphasizedForegroundColor(
       int command_id) const OVERRIDE;
   virtual base::string16 GetTooltipText(int command_id,
                                         const gfx::Point& p) const OVERRIDE;
@@ skipping 22 matching lines @@
   virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE;
   virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE;
   virtual bool IsItemChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandEnabled(int command_id) const OVERRIDE;
   virtual void ExecuteCommand(int command_id, int mouse_event_flags) OVERRIDE;
   virtual bool GetAccelerator(int command_id,
                               ui::Accelerator* accelerator) const OVERRIDE;
   virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE;
   virtual void WillHideMenu(views::MenuItemView* menu) OVERRIDE;
   virtual bool ShouldCloseOnDragComplete() OVERRIDE;
+  virtual bool InNestedDrag() OVERRIDE;
 
   // BaseBookmarkModelObserver overrides:
   virtual void BookmarkModelChanged() OVERRIDE;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
@@ skipping 67 matching lines @@
 
   // Used for managing "Recent tabs" menu items.
   scoped_ptr<RecentTabsMenuModelDelegate> recent_tabs_menu_model_delegate_;
 
   content::NotificationRegistrar registrar_;
 
   const bool use_new_menu_;
 
   const bool supports_new_separators_;
 
+  // Whether or not the menu is opened for a drag and drop operation.
+  bool for_drop_;
+
   ObserverList<WrenchMenuObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_