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

chrome/browser/ui/toolbar/wrench_menu_model.h

 // Copyright (c) 2012 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_TOOLBAR_WRENCH_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ skipping 71 matching lines @@
   // Range of command ID's to use for the items representing bookmarks in the
   // bookmark menu, must not overlap with that for recent tabs submenu.
   static const int kMinBookmarkCommandId = 1;
   static const int kMaxBookmarkCommandId = 1000;
 
   // Range of command ID's to use for the items in the recent tabs submenu, must
   // not overlap with that for bookmarks.
   static const int kMinRecentTabsCommandId = 1001;
   static const int kMaxRecentTabsCommandId = 1200;
 
-  // TODO: remove |is_new_menu|.
-  WrenchMenuModel(ui::AcceleratorProvider* provider,
-                  Browser* browser,
-                  bool is_new_menu);
+  WrenchMenuModel(ui::AcceleratorProvider* provider, Browser* browser);
   virtual ~WrenchMenuModel();
 
   // Overridden for ButtonMenuItemModel::Delegate:
   virtual bool DoesCommandIdDismissMenu(int command_id) const OVERRIDE;
 
   // Overridden for both ButtonMenuItemModel::Delegate and SimpleMenuModel:
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
   virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
   virtual bool GetIconForCommandId(int command_id,
                                    gfx::Image* icon) const OVERRIDE;
@@ skipping 31 matching lines @@
   // Calculates |zoom_label_| in response to a zoom change.
   void UpdateZoomControls();
 
  private:
   class HelpMenuModel;
   // Testing constructor used for mocking.
   friend class ::MockWrenchMenuModel;
 
   WrenchMenuModel();
 
-  void Build(bool is_new_menu);
+  void Build();
 
   void AddGlobalErrorMenuItems();
 
   // Appends everything needed for the clipboard menu: a menu break, the
-  // clipboard menu content and the finalizing menu break. If the last break
-  // is not needed it can be suppressed by setting |new_menu|
-  // to false.
-  void CreateCutCopyPasteMenu(bool new_menu);
+  // clipboard menu content and the finalizing menu break.
+  void CreateCutCopyPasteMenu();
 
   // Add a menu item for the extension icons.
   void CreateExtensionToolbarOverflowMenu();
 
   // Appends everything needed for the zoom menu: a menu break, then the zoom
-  // menu content and then another menu break. If the new menu type is used,
-  // |new_menu| should be set to true.
-  void CreateZoomMenu(bool new_menu);
+  // menu content and then another menu break.
+  void CreateZoomMenu();
 
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
 
   bool ShouldShowNewIncognitoWindowMenuItem();
 
   // Models for the special menu items with buttons.
   scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_;
   scoped_ptr<ui::ButtonMenuItemModel> zoom_menu_item_model_;
 
   // Label of the zoom label in the zoom menu item.
@@ skipping 19 matching lines @@
   TabStripModel* tab_strip_model_; // weak
 
   scoped_ptr<content::HostZoomMap::Subscription> content_zoom_subscription_;
   scoped_ptr<content::HostZoomMap::Subscription> browser_zoom_subscription_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_