Make all views platforms use 'new' (cros-style) wrench menu.

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 20 matching lines @@
 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:
   enum RunFlags {
-    // TODO: remove |USE_NEW_MENU| and |SUPPORTS_NEW_SEPARATORS|.
-    USE_NEW_MENU            = 1 << 0,
-    SUPPORTS_NEW_SEPARATORS = 1 << 1,
-
     // Indicates that the menu was opened for a drag-and-drop operation.
-    FOR_DROP                = 1 << 2,
+    FOR_DROP = 1 << 0,
   };
 
   WrenchMenu(Browser* browser, int run_flags);
   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();
 
   // Whether the menu is currently visible to the user.
   bool IsShowing();
 
-  bool use_new_menu() const { return (run_flags_ & USE_NEW_MENU) != 0; }
   bool for_drop() const { return (run_flags_ & FOR_DROP) != 0; }
 
   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,
@@ skipping 40 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   class CutCopyPasteView;
   class RecentTabsMenuModelDelegate;
   class ZoomView;
 
   typedef std::pair<ui::MenuModel*,int> Entry;
   typedef std::map<int,Entry> CommandIDToEntry;
 
-  bool supports_new_separators() const {
-    return (run_flags_ & SUPPORTS_NEW_SEPARATORS) != 0;
-  }
-
   // Populates |parent| with all the child menus in |model|. Recursively invokes
   // |PopulateMenu| for any submenu.
   void PopulateMenu(views::MenuItemView* parent,
                     ui::MenuModel* model);
 
   // Adds a new menu item to |parent| at |menu_index| to represent the item in
   // |model| at |model_index|:
   // - |menu_index|: position in |parent| to add the new item.
   // - |model_index|: position in |model| to retrieve information about the
   //   new menu item.
-  // - |height|: For button containing menu items, a |height| override can be
-  //   specified with a number bigger then 0.
   // The returned item's MenuItemView::GetCommand() is the same as that of
   // |model|->GetCommandIdAt(|model_index|).
   views::MenuItemView* AddMenuItem(views::MenuItemView* parent,
                                    int menu_index,
                                    ui::MenuModel* model,
                                    int model_index,
-                                   ui::MenuModel::ItemType menu_type,
-                                   int height);
+                                   ui::MenuModel::ItemType menu_type);
 
   // Invoked from the cut/copy/paste menus. Cancels the current active menu and
   // activates the menu item in |model| at |index|.
   void CancelAndEvaluate(ui::MenuModel* model, int index);
 
   // Creates the bookmark menu if necessary. Does nothing if already created or
   // the bookmark model isn't loaded.
   void CreateBookmarkMenu();
 
   // Returns the index of the MenuModel/index pair representing the |command_id|
@@ skipping 35 matching lines @@
 
   // The bit mask of RunFlags.
   const int run_flags_;
 
   ObserverList<WrenchMenuObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_