Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2614)

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

Issue 2721773003: [Mac] Remove dead code from bookmark bar controller (Closed)
Patch Set: Stray delete Created 3 years, 10 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
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 172955d39bf042c9ac397c80e71b9718fc661e83..55db28700eba0a74ba99b445bc099d227332b8c9 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -230,9 +230,6 @@ void RecordAppLaunch(Profile* profile, GURL url) {
// then show the no items label.
- (void)reconfigureBookmarkBar;
-- (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu;
-- (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu;
-- (void)tagEmptyMenu:(NSMenu*)menu;
- (void)clearMenuTagMap;
- (int)preferredHeight;
- (void)addButtonsToView;
@@ -1119,65 +1116,6 @@ void RecordAppLaunch(Profile* profile, GURL url) {
}
}
-// Recursively add the given bookmark node and all its children to
-// menu, one menu item per node.
-- (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu {
- NSString* title = [BookmarkMenuCocoaController menuTitleForNode:child];
- NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:title
- action:nil
- keyEquivalent:@""] autorelease];
- [menu addItem:item];
- [item setImage:[self faviconForNode:child forADarkTheme:NO]];
- if (child->is_folder()) {
- NSMenu* submenu = [[[NSMenu alloc] initWithTitle:title] autorelease];
- [menu setSubmenu:submenu forItem:item];
- if (!child->empty()) {
- [self addFolderNode:child toMenu:submenu]; // potentially recursive
- } else {
- [self tagEmptyMenu:submenu];
- }
- } else {
- [item setTarget:self];
- [item setAction:@selector(openBookmarkMenuItem:)];
- [item setTag:[self menuTagFromNodeId:child->id()]];
- if (child->is_url())
- [item setToolTip:[BookmarkMenuCocoaController tooltipForNode:child]];
- }
-}
-
-// Empty menus are odd; if empty, add something to look at.
-// Matches windows behavior.
-- (void)tagEmptyMenu:(NSMenu*)menu {
- NSString* empty_menu_title = l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU);
- [menu addItem:[[[NSMenuItem alloc] initWithTitle:empty_menu_title
- action:NULL
- keyEquivalent:@""] autorelease]];
-}
-
-// Add the children of the given bookmark node (and their children...)
-// to menu, one menu item per node.
-- (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu {
- for (int i = 0; i < node->child_count(); i++) {
- const BookmarkNode* child = node->GetChild(i);
- [self addNode:child toMenu:menu];
- }
-}
-
-// Return an autoreleased NSMenu that represents the given bookmark
-// folder node.
-- (NSMenu *)menuForFolderNode:(const BookmarkNode*)node {
- if (!node->is_folder())
- return nil;
- NSString* title = base::SysUTF16ToNSString(node->GetTitle());
- NSMenu* menu = [[[NSMenu alloc] initWithTitle:title] autorelease];
- [self addFolderNode:node toMenu:menu];
-
- if (![menu numberOfItems]) {
- [self tagEmptyMenu:menu];
- }
- return menu;
-}
-
// Return an appropriate width for the given bookmark button cell.
- (CGFloat)widthForBookmarkButtonCell:(NSCell*)cell {
return std::min([cell cellSize].width, bookmarks::kDefaultBookmarkWidth);

Powered by Google App Engine
This is Rietveld 408576698