Revert of Removing "All Bookmarks"

ios/chrome/browser/ui/bookmarks/bookmark_menu_view.mm

 // Copyright 2014 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 "ios/chrome/browser/ui/bookmarks/bookmark_menu_view.h"
 
 #include <memory>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/objc_property_releaser.h"
@@ skipping 119 matching lines @@
 
   const BookmarkNode* mobileBookmarks = self.bookmarkModel->mobile_node();
   const BookmarkNode* bookmarkBar = self.bookmarkModel->bookmark_bar_node();
   const BookmarkNode* otherBookmarks = self.bookmarkModel->other_node();
 
   // The first section is always visible.
   base::scoped_nsobject<NSMutableArray> topSection(
       [[NSMutableArray alloc] init]);
   [self.menuItems addObject:topSection];
 
-  // Mobile bookmark is shown even if empty.
-  [topSection
-      addObject:[BookmarkMenuItem folderMenuItemForNode:mobileBookmarks
-                                           rootAncestor:mobileBookmarks]];
-  // Bookmarks Bar and Other Bookmarks are special folders and are shown at the
-  // top if they contain anything.
+  if (experimental_flags::IsAllBookmarksEnabled()) {
+    // All Items is always visible.
+    [topSection addObject:[BookmarkMenuItem allMenuItem]];
+  }
+  // Bookmarks Bar, Mobile Bookmarks and Other Bookmarks are special folders and
+  // are shown at the top if they contain anything.
+  if (!mobileBookmarks->empty() ||
+      !experimental_flags::IsAllBookmarksEnabled()) {
+    [topSection
+        addObject:[BookmarkMenuItem folderMenuItemForNode:mobileBookmarks
+                                             rootAncestor:mobileBookmarks]];
+  }
   if (!bookmarkBar->empty()) {
     [topSection addObject:[BookmarkMenuItem folderMenuItemForNode:bookmarkBar
                                                      rootAncestor:bookmarkBar]];
   }
   if (!otherBookmarks->empty()) {
     [topSection
         addObject:[BookmarkMenuItem folderMenuItemForNode:otherBookmarks
                                              rootAncestor:otherBookmarks]];
   }
 
@@ skipping 99 matching lines @@
     return;
   }
 
   if (parentFolder == self.primaryMenuItem.folder || !node->is_folder()) {
     // A child of the selected folder has been deleted or a url not visible in
     // the UI right now has been deleted. Nothing to do as the menu itself needs
     // no change.
     return;
   }
 
+  if (node == self.primaryMenuItem.rootAncestor) {
+    // The deleted node is the root node of the current selected folder. Move to
+    // all items.
+    self.primaryMenuItem = [BookmarkMenuItem allMenuItem];
+    [self.delegate bookmarkMenuView:self selectedMenuItem:self.primaryMenuItem];
+    [self reloadData];
+    return;
+  }
+
   const BookmarkNode* root =
       RootLevelFolderForNode(parentFolder, self.bookmarkModel);
 
   if (root != self.primaryMenuItem.rootAncestor) {
     // The deleted folder is not in the same hierarchy as the current selected
     // folder, there is nothing to reload unless the deleted folder is a root
     // node.
     if (!root)
       [self reloadData];
     return;
@@ skipping 103 matching lines @@
     viewForFooterInSection:(NSInteger)section {
   return [[[UIView alloc] initWithFrame:CGRectZero] autorelease];
 }
 
 #pragma mark MDCInkTouchControllerDelegate
 
 - (BOOL)inkTouchController:(MDCInkTouchController*)inkTouchController
     shouldProcessInkTouchesAtTouchLocation:(CGPoint)location {
   NSIndexPath* indexPath = [self.tableView indexPathForRowAtPoint:location];
   BookmarkMenuItem* menuItem = [self menuItemAtIndexPath:indexPath];
-  return menuItem.type == bookmarks::MenuItemFolder;
+  return menuItem.type == bookmarks::MenuItemAll ||
+         menuItem.type == bookmarks::MenuItemFolder;
 }
 
 - (MDCInkView*)inkTouchController:(MDCInkTouchController*)inkTouchController
            inkViewAtTouchLocation:(CGPoint)location {
   NSIndexPath* indexPath = [self.tableView indexPathForRowAtPoint:location];
   BookmarkMenuCell* cell = base::mac::ObjCCastStrict<BookmarkMenuCell>(
       [self.tableView cellForRowAtIndexPath:indexPath]);
   return cell.inkView;
 }
 
 #pragma mark Public Methods
 
 - (void)updatePrimaryMenuItem:(BookmarkMenuItem*)menuItem {
   if ([self.primaryMenuItem isEqual:menuItem])
     return;
 
   self.primaryMenuItem = menuItem;
   [self.tableView reloadData];
 }
 
 - (void)setScrollsToTop:(BOOL)scrollsToTop {
   self.tableView.scrollsToTop = scrollsToTop;
 }
 
 @end