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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 59 matching lines @@
 
 void BookmarkContextMenuController::BuildMenu() {
   if (selection_.size() == 1 && selection_[0]->is_url()) {
     AddItem(IDC_BOOKMARK_BAR_OPEN_ALL,
             IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB);
     AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
             IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW);
     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_);
+    int incognitoCount =

[Peter Kasting, 2017/04/13 04:52:09]

Nit: Variable names in Chromium are spelled unix_hacker-style, not camelCase.

Declare this variable as close to first use as possible, or inline into the
statement below that uses it.

[Paezagon, 2017/04/14 01:00:29]

I am going to move it down, as I believe using the variable improves
readability.

+        chrome::OpenCount(parent_window_, selection_, true, profile_);
+    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));
     AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
-            IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO);
+            l10n_util::GetPluralStringFUTF16(
+                IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, incognitoCount));
   }
 
   AddSeparator();
   if (selection_.size() == 1 && selection_[0]->is_folder()) {
     AddItem(IDC_BOOKMARK_BAR_RENAME_FOLDER, IDS_BOOKMARK_BAR_RENAME_FOLDER);
   } else {
     AddItem(IDC_BOOKMARK_BAR_EDIT, IDS_BOOKMARK_BAR_EDIT);
   }
 
   AddSeparator();
@@ skipping 18 matching lines @@
   // Use the native host desktop type in tests.
   if (chrome::IsAppsShortcutEnabled(profile_)) {
     AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT,
                     IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT);
   }
   AddCheckboxItem(IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS,
                   IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS_DEFAULT_NAME);
   AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW, IDS_SHOW_BOOKMARK_BAR);
 }
 
+void BookmarkContextMenuController::AddItem(int id, base::string16 str) {
+  menu_model_->AddItem(id, str);
+}
+
 void BookmarkContextMenuController::AddItem(int id, int localization_id) {
   menu_model_->AddItemWithStringId(id, localization_id);
 }
 
 void BookmarkContextMenuController::AddSeparator() {
   menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
 }
 
 void BookmarkContextMenuController::AddCheckboxItem(int id,
                                                     int localization_id) {
@@ skipping 291 matching lines @@
     return !managed->managed_node()->empty();
   }
 
   return true;
 }
 
 void BookmarkContextMenuController::BookmarkModelChanged() {
   if (delegate_)
     delegate_->CloseMenu();
 }