MacViews: Gets wrench menu working

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 120 matching lines @@
   // 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);
 
   // 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);
+  void CancelAndEvaluate(ui::ButtonMenuItemModel* 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|
   // in |command_id_to_entry_|.
   int ModelIndexFromCommandId(int command_id) const;
 
   // The views menu. Owned by |menu_runner_|.
   views::MenuItemView* root_;
 
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   // Maps from the command ID in model to the model/index pair the item came
   // from.
   CommandIDToEntry command_id_to_entry_;
 
   // Browser the menu is being shown for.
   Browser* browser_;
 
   // |CancelAndEvaluate| sets |selected_menu_model_| and |selected_index_|.
   // If |selected_menu_model_| is non-null after the menu completes
   // ActivatedAt is invoked. This is done so that ActivatedAt isn't invoked
   // while the message loop is nested.
-  ui::MenuModel* selected_menu_model_;
+  ui::ButtonMenuItemModel* selected_menu_model_;
   int selected_index_;
 
   // Used for managing the bookmark menu items.
   scoped_ptr<BookmarkMenuDelegate> bookmark_menu_delegate_;
 
   // Menu corresponding to IDC_BOOKMARKS_MENU.
   views::MenuItemView* bookmark_menu_;
 
   // Menu corresponding to IDC_FEEDBACK.
   views::MenuItemView* feedback_menu_item_;
@@ skipping 11 matching lines @@
 
   ObserverList<WrenchMenuObserver> observer_list_;
 
   // Records the time from when menu opens to when the user selects a menu item.
   base::ElapsedTimer menu_opened_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_