Chromium Code Reviews| Index: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc |
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc |
| index d3a20fc7bd77fa27c2b380bbb45dffa3a87ee625..2e99201cd0784bcbe9d85ed7ad7bce608d7e3992 100644 |
| --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc |
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc |
| @@ -440,15 +440,18 @@ void BookmarkMenuDelegate::BuildMenusForPermanentNodes( |
| views::MenuItemView* menu, |
| int* next_menu_id) { |
| BookmarkModel* model = GetBookmarkModel(); |
| + ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); |
| + gfx::ImageSkia* folder_icon = rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER); |
| bool added_separator = false; |
| - BuildMenuForPermanentNode(model->other_node(), menu, next_menu_id, |
| - &added_separator); |
| - BuildMenuForPermanentNode(model->mobile_node(), menu, next_menu_id, |
| - &added_separator); |
| + BuildMenuForPermanentNode(model->other_node(), folder_icon, menu, |
|
sky
2014/06/19 15:02:54
How about making this take the id, that way code t
Joao da Silva
2014/06/19 15:56:35
Done.
|
| + next_menu_id, &added_separator); |
| + BuildMenuForPermanentNode(model->mobile_node(), folder_icon, menu, |
| + next_menu_id, &added_separator); |
| } |
| void BookmarkMenuDelegate::BuildMenuForPermanentNode( |
| const BookmarkNode* node, |
| + gfx::ImageSkia* folder_icon, |
| MenuItemView* menu, |
| int* next_menu_id, |
| bool* added_separator) { |
| @@ -466,8 +469,6 @@ void BookmarkMenuDelegate::BuildMenuForPermanentNode( |
| menu->AppendSeparator(); |
| } |
| - ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); |
| - gfx::ImageSkia* folder_icon = rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER); |
| MenuItemView* submenu = menu->AppendSubMenuWithIcon( |
| id, node->GetTitle(), *folder_icon); |
| BuildMenu(node, 0, submenu, next_menu_id); |
| @@ -480,9 +481,11 @@ void BookmarkMenuDelegate::BuildMenuForManagedNode( |
| // Don't add a separator for this menu. |
| bool added_separator = true; |
| const BookmarkNode* node = GetChromeBookmarkClient()->managed_node(); |
| - // TODO(joaodasilva): use the "managed bookmark folder" icon here. |
| - // http://crbug.com/49598 |
| - BuildMenuForPermanentNode(node, menu, next_menu_id, &added_separator); |
| + ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); |
| + gfx::ImageSkia* folder_icon = |
| + rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED); |
| + BuildMenuForPermanentNode(node, folder_icon, menu, next_menu_id, |
| + &added_separator); |
| } |
| void BookmarkMenuDelegate::BuildMenu(const BookmarkNode* parent, |