Making bookmark folder context menu display the number of bookmarks that will be opened by Open All

chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc

Index: chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
index c458e03c0829524481653ee95958a0244c6b8b22..a975d265feb61af1bc3a45895098fb1e2f27c3c5 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
@@ -77,11 +77,18 @@ void BookmarkContextMenuController::BuildMenu() {
     AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
             IDS_BOOKMARK_BAR_OPEN_INCOGNITO);
   } else {
-    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL, IDS_BOOKMARK_BAR_OPEN_ALL);
+    int count = chrome::OpenCount(parent_window_, selection_);
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL,
+            l10n_util::GetPluralStringFUTF16(IDS_BOOKMARK_BAR_OPEN_ALL, count));
     AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
-            IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW);
+            l10n_util::GetPluralStringFUTF16(
+                IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, count));
+
+    int incognito_count =
+        chrome::OpenCount(parent_window_, selection_, profile_);
     AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
-            IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO);
+            l10n_util::GetPluralStringFUTF16(
+                IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, incognito_count));
   }
 
   AddSeparator();
@@ -120,6 +127,10 @@ void BookmarkContextMenuController::BuildMenu() {
   AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW, IDS_SHOW_BOOKMARK_BAR);
 }
 
+void BookmarkContextMenuController::AddItem(int id, const base::string16 str) {
+  menu_model_->AddItem(id, str);
+}
+
 void BookmarkContextMenuController::AddItem(int id, int localization_id) {
   menu_model_->AddItemWithStringId(id, localization_id);
 }
@@ -391,7 +402,8 @@ bool BookmarkContextMenuController::IsCommandIdEnabled(int command_id) const {
     case IDC_BOOKMARK_BAR_NEW_FOLDER:
     case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK:
       return can_edit && model_->client()->CanBeEditedByUser(parent_) &&
-             bookmarks::GetParentForNewNodes(parent_, selection_, NULL) != NULL;
+             bookmarks::GetParentForNewNodes(parent_, selection_, nullptr) !=

[Peter Kasting, 2017/04/14 19:04:40]

Nit: Could just remove "!= nullptr"

[Paezagon, 2017/04/14 19:52:34]

Done.

+                 nullptr;
 
     case IDC_BOOKMARK_BAR_ALWAYS_SHOW:
       return !prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar);