diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/bookmarks')
7 files changed, 24 insertions, 24 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 47dab5d..0c0cd6a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -33,7 +33,7 @@ - (void)awakeFromNib { [self setInitialName: - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME)]; + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME)]; [super awakeFromNib]; } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index fa8dca6..0f63781 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -197,11 +197,11 @@ void BookmarkBubbleNotificationBridge::Observe( origin.x -= bubbleArrowtip.x; [window setFrameOrigin:origin]; [parentWindow_ addChildWindow:window ordered:NSWindowAbove]; - // Default is IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK; "Bookmark". + // Default is IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK; "Bookmark". // If adding for the 1st time the string becomes "Bookmark Added!" if (!alreadyBookmarked_) { NSString* title = - l10n_util::GetNSString(IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED); + l10n_util::GetNSString(IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED); [bigTitle_ setStringValue:title]; } @@ -370,7 +370,7 @@ void BookmarkBubbleNotificationBridge::Observe( + (NSString*)chooseAnotherFolderString { return l10n_util::GetNSStringWithFixup( - IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); + IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); } // For the given folder node, walk the tree and add folder names to diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index b780784..6d37efd 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -543,7 +543,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver { if (parentInfo) { NSIndexPath* selection = [self selectedIndexPath]; NSString* newFolderName = - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); BookmarkFolderInfo* folderInfo = [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:newFolderName]; [self willChangeValueForKey:@"folderTreeArray"]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 989bd10..6c35175 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -150,7 +150,7 @@ TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) { EXPECT_EQ(2, folder_b_3_->child_count()); [controller_ selectTestNodeInBrowser:folder_b_3_]; NSString* expectedName = - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); [controller_ setDisplayName:expectedName]; [controller_ newFolder:nil]; NSArray* selectionPaths = [controller_ tableSelectionPaths]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 3b1ddd1..d982d4c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -97,7 +97,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu, // and fill it in. if (!model->other_node()->empty()) { NSString* other_items_title = - l10n_util::GetNSString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME); + l10n_util::GetNSString(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME); [bookmark_menu addItem:[NSMenuItem separatorItem]]; AddNodeAsSubmenu(bookmark_menu, model->other_node(), @@ -259,13 +259,13 @@ void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu, [menu addItem:[NSMenuItem separatorItem]]; bool enabled = child_count != 0; AddItemToMenu(IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL, + IDS_BOOKMARK_BAR_OPEN_ALL, node, menu, enabled); AddItemToMenu(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, node, menu, enabled); AddItemToMenu(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO, + IDS_BOOKMARK_BAR_OPEN_INCOGNITO, node, menu, enabled); } } 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 a75629b..d973a6a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -253,26 +253,26 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) { EXPECT_EQ(0, [menu numberOfItems]); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL, root, menu, true); + IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, true); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true); + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, true); + IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, true); EXPECT_EQ(3, [menu numberOfItems]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(@selector(openAllBookmarks:), [item action]); EXPECT_TRUE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]); EXPECT_TRUE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_INCOGNITO); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(@selector(openAllBookmarksIncognitoWindow:), [item action]); @@ -282,26 +282,26 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) { EXPECT_EQ(0, [menu numberOfItems]); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL, root, menu, false); + IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, false); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false); + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, false); + IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, false); EXPECT_EQ(3, [menu numberOfItems]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(nil, [item action]); EXPECT_FALSE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(nil, [item action]); EXPECT_FALSE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_INCOGNITO); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(nil, [item action]); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index e988c56..a4c4d0c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -4,12 +4,12 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" -#include "ui/base/l10n/l10n_util.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" @implementation BookmarkNameFolderController @@ -36,7 +36,7 @@ initialName_.reset([base::SysUTF16ToNSString(node_->GetTitle()) retain]); } else { NSString* newString = - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); initialName_.reset([newString retain]); } } |