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

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

 // 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.
 
 #import <AppKit/AppKit.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 279 matching lines @@
                   IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
                   node, menu, incognito_enabled);
   }
 }
 
 void BookmarkMenuBridge::AddItemToMenu(int command_id,
                                        int message_id,
                                        const BookmarkNode* node,
                                        NSMenu* menu,
                                        bool enabled) {
-  NSString* title = l10n_util::GetNSStringWithFixup(message_id);
+  int count = 0;
+  if (message_id == IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO) {
+    count = chrome::OpenCount(NULL, node, true, profile_);

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

Nit: nullptr

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

Done.

+  } else {
+    count = chrome::OpenCount(NULL, node);
+  }

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

Nit: Two potential simpler routes:

  int count = (message_id == IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)
                  ? chrome::OpenCount(NULL, node, true, profile_);
                  : chrome::OpenCount(NULL, node);

  bool incognito = (message_id == IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO);
  content::BrowserContext* context = incognito ? profile_ : nullptr;
  int count = chrome::OpenCount(nullptr, node, incognito, context);

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

Done.

+
+  NSString* title = l10n_util::GetPluralNSStringF(message_id, count);
   SEL action;
   if (!enabled) {
     // A nil action makes a menu item appear disabled. NSMenuItem setEnabled
     // will not reflect the disabled state until the item title is set again.
     action = nil;
   } else if (command_id == IDC_BOOKMARK_BAR_OPEN_ALL) {
     action = @selector(openAllBookmarks:);
   } else if (command_id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW) {
     action = @selector(openAllBookmarksNewWindow:);
   } else {
@@ skipping 36 matching lines @@
 
 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {
   if (!node)
     return nil;
   std::map<const BookmarkNode*, NSMenuItem*>::iterator it =
       bookmark_nodes_.find(node);
   if (it == bookmark_nodes_.end())
     return nil;
   return it->second;
 }