Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7990)

Unified Diff: chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm b/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
index a76602bebf038aff48c846fa81b008fad38dc576..2b10e20a87642bfed871907a1b7daf935dd3796f 100644
--- a/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
@@ -68,7 +68,6 @@ using base::UserMetricsAction;
- (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
@@ -401,7 +400,7 @@ class ToolbarActionsBarObserverHelper : public ToolbarActionsBarObserver {
DCHECK(!browserActionsController_.get());
// First empty out the menu and create a new model.
- [self removeAllItems:menu];
+ [menu removeAllItems];
[self createModel];
[menu setMinimumWidth:0];
@@ -409,7 +408,7 @@ class ToolbarActionsBarObserverHelper : public ToolbarActionsBarObserver {
// 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];
}
@@ -545,13 +544,6 @@ class ToolbarActionsBarObserverHelper : public ToolbarActionsBarObserver {
}
}
-// -[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];
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698