mac: Remove IsOSLion().

chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 50 matching lines @@
 }
 
 using base::UserMetricsAction;
 
 @interface AppMenuController (Private)
 - (void)createModel;
 - (void)adjustPositioning;
 - (void)performCommandDispatch:(NSNumber*)tag;
 - (NSButton*)zoomDisplay;
 - (void)menu:(NSMenu*)menu willHighlightItem:(NSMenuItem*)item;
-- (void)removeAllItems:(NSMenu*)menu;
 - (NSMenu*)recentTabsSubmenu;
 - (RecentTabsSubMenuModel*)recentTabsMenuModel;
 - (int)maxWidthForMenuModel:(ui::MenuModel*)model
                  modelIndex:(int)modelIndex;
 @end
 
 namespace AppMenuControllerInternal {
 
 // A C++ delegate that handles the accelerators in the app menu.
 class AcceleratorDelegate : public ui::AcceleratorProvider {
@@ skipping 312 matching lines @@
   UMA_HISTOGRAM_TIMES("Toolbar.AppMenuTimeToAction",
                       base::TimeTicks::Now() - menuOpenTime_);
   menuOpenTime_ = base::TimeTicks();
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   // We should never have a BrowserActionsController before creating the menu.
   DCHECK(!browserActionsController_.get());
 
   // First empty out the menu and create a new model.
-  [self removeAllItems:menu];
+  [menu removeAllItems];
   [self createModel];
   [menu setMinimumWidth:0];
 
   // Create a new menu, which cannot be swapped because the tracking is about to
   // start, so simply copy the items.
   NSMenu* newMenu = [self menuFromModel:model_];
   NSArray* itemArray = [newMenu itemArray];
-  [self removeAllItems:newMenu];
+  [newMenu removeAllItems];
   for (NSMenuItem* item in itemArray) {
     [menu addItem:item];
   }
 
   [self updateRecentTabsSubmenu];
   [self updateBookmarkSubMenu];
   [self updateBrowserActionsSubmenu];
 }
 
 // Used to dispatch commands from the App menu. The custom items within the
@@ skipping 115 matching lines @@
   return [buttonViewController_ zoomDisplay];
 }
 
 - (void)menu:(NSMenu*)menu willHighlightItem:(NSMenuItem*)item {
   if (browserActionsController_.get()) {
     [browserActionsController_ setFocusedInOverflow:
         (item == browserActionsMenuItem_)];
   }
 }
 
-// -[NSMenu removeAllItems] is only available on 10.6+.
-- (void)removeAllItems:(NSMenu*)menu {
-  while ([menu numberOfItems]) {
-    [menu removeItemAtIndex:0];
-  }
-}
-
 - (NSMenu*)recentTabsSubmenu {
   NSString* title = l10n_util::GetNSStringWithFixup(IDS_RECENT_TABS_MENU);
   return [[[self menu] itemWithTitle:title] submenu];
 }
 
 // The recent tabs menu model is recognized by the existence of either the
 // kRecentlyClosedHeaderCommandId or the kDisabledRecentlyClosedHeaderCommandId.
 - (RecentTabsSubMenuModel*)recentTabsMenuModel {
   int index = 0;
   // Start searching at the app menu model level, |model| will be updated only
@@ skipping 76 matching lines @@
   // (and thus, after all our ability to adjust it normally). Throw in the
   // towel, and simply don't let the frame move from where it's supposed to be.
   // TODO(devlin): Yet another Cocoa hack. It'd be good to find a workaround,
   // but unlikely unless we replace the Cocoa menu implementation.
   NSView* containerSuperview = [overflowActionsContainerView_ superview];
   if (NSMinX([containerSuperview frame]) != 0)
     [containerSuperview setFrameOrigin:NSZeroPoint];
 }
 
 @end  // @implementation AppMenuButtonViewController