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

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

Issue 339413002: Use the managed bookmarks icon for its folder on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 537f99d7c48afc88c4d0b247c66c6820dc5bde7e..075374d58a0042d071662c40648ec664b99801b4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -83,9 +83,13 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,
const BookmarkNode* managedNode = client->managed_node();
if (!barNode->empty() || !managedNode->empty())
[bookmark_menu addItem:[NSMenuItem separatorItem]];
- // TODO(joaodasilva): use the 'Managed Bookmarks' icon for the managedNode.
- if (!managedNode->empty())
- AddNodeAsSubmenu(bookmark_menu, managedNode, !is_submenu);
+ if (!managedNode->empty()) {
+ // Most users never see this node, so the image is only loaded if needed.
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ NSImage* image =
+ rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage();
+ AddNodeAsSubmenu(bookmark_menu, managedNode, image, !is_submenu);
+ }
if (!barNode->empty())
AddNodeToMenu(barNode, bookmark_menu, !is_submenu);
@@ -95,6 +99,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,
[bookmark_menu addItem:[NSMenuItem separatorItem]];
AddNodeAsSubmenu(bookmark_menu,
model->other_node(),
+ folder_image_,
!is_submenu);
}
@@ -108,6 +113,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,
AddNodeAsSubmenu(bookmark_menu,
model->mobile_node(),
+ folder_image_,
!is_submenu);
}
@@ -223,13 +229,14 @@ void BookmarkMenuBridge::ClearBookmarkMenu(NSMenu* menu) {
void BookmarkMenuBridge::AddNodeAsSubmenu(NSMenu* menu,
const BookmarkNode* node,
+ NSImage* image,
bool add_extra_items) {
NSString* title = SysUTF16ToNSString(node->GetTitle());
NSMenuItem* items = [[[NSMenuItem alloc]
initWithTitle:title
action:nil
keyEquivalent:@""] autorelease];
- [items setImage:folder_image_];
+ [items setImage:image];
[menu addItem:items];
NSMenu* submenu = [[[NSMenu alloc] initWithTitle:title] autorelease];
[menu setSubmenu:submenu forItem:items];
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698