| Index: ios/chrome/browser/ui/bookmarks/bookmark_menu_item.mm
|
| diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_menu_item.mm b/ios/chrome/browser/ui/bookmarks/bookmark_menu_item.mm
|
| index 45c6b0eee9d0507d8ce80ba59114b452a80d253f..b5920fe97e1c35f43f9ac21aa8d8f48daf2cc20a 100644
|
| --- a/ios/chrome/browser/ui/bookmarks/bookmark_menu_item.mm
|
| +++ b/ios/chrome/browser/ui/bookmarks/bookmark_menu_item.mm
|
| @@ -18,11 +18,10 @@ using bookmarks::BookmarkNode;
|
| namespace bookmarks {
|
| BOOL NumberIsValidMenuItemType(int number) {
|
| // Invalid and deprecated numbers.
|
| - if (number < 0 || number > MenuItemLast)
|
| + if (number < 1 || number > MenuItemLast)
|
| return NO;
|
| MenuItemType type = static_cast<MenuItemType>(number);
|
| switch (type) {
|
| - case MenuItemAll:
|
| case MenuItemFolder:
|
| return YES;
|
|
|
| @@ -61,7 +60,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (UIAccessibilityTraits)accessibilityTraits {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| case bookmarks::MenuItemFolder:
|
| return super.accessibilityTraits |= UIAccessibilityTraitButton;
|
| case bookmarks::MenuItemSectionHeader:
|
| @@ -73,8 +71,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (NSString*)title {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| - return l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_ALL_BOOKMARKS_LABEL);
|
| case bookmarks::MenuItemDivider:
|
| return nil;
|
| case bookmarks::MenuItemFolder:
|
| @@ -86,8 +82,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (NSString*)titleForMenu {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| - return l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_ALL_BOOKMARKS_LABEL);
|
| case bookmarks::MenuItemDivider:
|
| case bookmarks::MenuItemFolder:
|
| case bookmarks::MenuItemSectionHeader:
|
| @@ -97,8 +91,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (NSString*)titleForNavigationBar {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| - return l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_BOOKMARKS_LABEL);
|
| case bookmarks::MenuItemDivider:
|
| case bookmarks::MenuItemFolder:
|
| case bookmarks::MenuItemSectionHeader:
|
| @@ -108,8 +100,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (NSString*)accessibilityIdentifier {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| - return @"MenuItemAll";
|
| case bookmarks::MenuItemDivider:
|
| return nil;
|
| case bookmarks::MenuItemFolder:
|
| @@ -121,11 +111,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (UIImage*)imagePrimary:(BOOL)primary {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| - if (primary)
|
| - return [UIImage imageNamed:@"bookmark_blue_star"];
|
| - else
|
| - return [UIImage imageNamed:@"bookmark_gray_star"];
|
| case bookmarks::MenuItemFolder:
|
| if (self.folder->type() == BookmarkNode::BOOKMARK_BAR ||
|
| self.folder->type() == BookmarkNode::MOBILE ||
|
| @@ -152,7 +137,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
| case bookmarks::MenuItemDivider:
|
| case bookmarks::MenuItemSectionHeader:
|
| return NO;
|
| - case bookmarks::MenuItemAll:
|
| case bookmarks::MenuItemFolder:
|
| return YES;
|
| }
|
| @@ -160,7 +144,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| - (BOOL)supportsEditing {
|
| switch (self.type) {
|
| - case bookmarks::MenuItemAll:
|
| case bookmarks::MenuItemFolder:
|
| return YES;
|
| case bookmarks::MenuItemDivider:
|
| @@ -181,7 +164,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
|
|
| switch (self.type) {
|
| case bookmarks::MenuItemDivider:
|
| - case bookmarks::MenuItemAll:
|
| return YES;
|
| case bookmarks::MenuItemFolder:
|
| return self.folder == otherMenuItem.folder;
|
| @@ -203,7 +185,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
| - (NSUInteger)hash {
|
| switch (self.type) {
|
| case bookmarks::MenuItemDivider:
|
| - case bookmarks::MenuItemAll:
|
| return self.type;
|
| case bookmarks::MenuItemFolder:
|
| return self.type + reinterpret_cast<NSUInteger>(self.folder);
|
| @@ -212,12 +193,6 @@ BOOL NumberIsValidMenuItemType(int number) {
|
| }
|
| }
|
|
|
| -+ (BookmarkMenuItem*)allMenuItem {
|
| - BookmarkMenuItem* item = [[[BookmarkMenuItem alloc] init] autorelease];
|
| - item.type = bookmarks::MenuItemAll;
|
| - return item;
|
| -}
|
| -
|
| + (BookmarkMenuItem*)dividerMenuItem {
|
| BookmarkMenuItem* item = [[[BookmarkMenuItem alloc] init] autorelease];
|
| item.type = bookmarks::MenuItemDivider;
|
|
|