chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm - Issue 2809003002: Making bookmark folder context menu display the number of bookmarks that will be opened by Open All

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm

Issue 2809003002: Making bookmark folder context menu display the number of bookmarks that will be opened by Open All (Closed)

Patch Set: Refactoring URL itteration function as per comments, addressing other formatting and style errors Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc » ('j') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm

index b17c02e7934833784fd452b42fe1497cba67313e..082457d1ae1e929e4d84be704c9d53bf12034e5a 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm

@@ -260,19 +260,20 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) {

IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, true);

EXPECT_EQ(3, [menu numberOfItems]);

- title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL);

+ title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL, 0);

item = [menu itemWithTitle:title];

EXPECT_TRUE(item);

EXPECT_EQ(@selector(openAllBookmarks:), [item action]);

EXPECT_TRUE([item isEnabled]);

- title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW);

+ title =

+ l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 0);

item = [menu itemWithTitle:title];

EXPECT_TRUE(item);

EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]);

EXPECT_TRUE([item isEnabled]);

- title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO);

+ title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_INCOGNITO, 0);

item = [menu itemWithTitle:title];

EXPECT_TRUE(item);

EXPECT_EQ(@selector(openAllBookmarksIncognitoWindow:), [item action]);

@@ -289,19 +290,20 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) {

IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, false);

EXPECT_EQ(3, [menu numberOfItems]);

- title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL);

+ title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL, 0);

item = [menu itemWithTitle:title];

EXPECT_TRUE(item);

EXPECT_EQ(nil, [item action]);

EXPECT_FALSE([item isEnabled]);

- title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW);

+ title =

+ l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 0);

item = [menu itemWithTitle:title];

EXPECT_TRUE(item);

EXPECT_EQ(nil, [item action]);

EXPECT_FALSE([item isEnabled]);

- title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO);

+ title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_INCOGNITO, 0);

item = [menu itemWithTitle:title];

EXPECT_TRUE(item);

EXPECT_EQ(nil, [item action]);