Remove the Menu object, converting all the remaining callers to use Menu2. I'...

chrome/browser/views/toolbar_view.h

 // Copyright (c) 2006-2008 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_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "base/ref_counted.h"
@@ skipping 209 matching lines @@
   views::MenuButton* page_menu_;
   views::MenuButton* app_menu_;
   // The bookmark menu button. This may be null.
   views::MenuButton* bookmark_menu_;
   Profile* profile_;
   Browser* browser_;
 
   // Current tab we're showing state for.
   TabContents* tab_;
 
-  // Profiles menu to populate with profile names.
-  views::Menu* profiles_menu_;
+  // Contents of the profiles menu to populate with profile names.
+  scoped_ptr<views::SimpleMenuModel> profiles_menu_contents_;
 
   // Helper class to enumerate profiles information on the file thread.
   scoped_refptr<GetProfilesHelper> profiles_helper_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 
   // The contents of the various menus.
   scoped_ptr<views::SimpleMenuModel> page_menu_contents_;
   scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
   scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
   scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_;
   scoped_ptr<views::SimpleMenuModel> app_menu_contents_;
 
   // TODO(beng): build these into MenuButton.
   scoped_ptr<views::Menu2> page_menu_menu_;
   scoped_ptr<views::Menu2> app_menu_menu_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_