Update bookmark bar folder icons to MD; vectorize.

chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 436 matching lines @@
   BuildMenu(parent, start_child_index, menu);
   if (show_permanent)
     BuildMenusForPermanentNodes(menu);
   return menu;
 }
 
 void BookmarkMenuDelegate::BuildMenusForPermanentNodes(
     views::MenuItemView* menu) {
   BookmarkModel* model = GetBookmarkModel();
   bool added_separator = false;
-  BuildMenuForPermanentNode(model->other_node(), IDR_BOOKMARK_BAR_FOLDER, menu,
+  BuildMenuForPermanentNode(model->other_node(),
+                            chrome::GetBookmarkFolderIcon(), menu,
                             &added_separator);
-  BuildMenuForPermanentNode(model->mobile_node(), IDR_BOOKMARK_BAR_FOLDER, menu,
+  BuildMenuForPermanentNode(model->mobile_node(),
+                            chrome::GetBookmarkFolderIcon(), menu,
                             &added_separator);
 }
 
-void BookmarkMenuDelegate::BuildMenuForPermanentNode(
-    const BookmarkNode* node,
-    int icon_resource_id,
-    MenuItemView* menu,
-    bool* added_separator) {
+void BookmarkMenuDelegate::BuildMenuForPermanentNode(const BookmarkNode* node,
+                                                     const gfx::ImageSkia& icon,
+                                                     MenuItemView* menu,
+                                                     bool* added_separator) {
   if (!node->IsVisible() || node->GetTotalNodeCount() == 1)
     return;  // No children, don't create a menu.
 
   if (!*added_separator) {
     *added_separator = true;
     menu->AppendSeparator();
   }
 
-  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* folder_icon = rb->GetImageSkiaNamed(icon_resource_id);
-  AddMenuToMaps(menu->AppendSubMenuWithIcon(next_menu_id_++, node->GetTitle(),
-                                            *folder_icon),
-                node);
+  AddMenuToMaps(
+      menu->AppendSubMenuWithIcon(next_menu_id_++, node->GetTitle(), icon),
+      node);
 }
 
 void BookmarkMenuDelegate::BuildMenuForManagedNode(MenuItemView* menu) {
   // Don't add a separator for this menu.
   bool added_separator = true;
   const BookmarkNode* node = GetManagedBookmarkService()->managed_node();
-  BuildMenuForPermanentNode(node, IDR_BOOKMARK_BAR_FOLDER_MANAGED, menu,
+  BuildMenuForPermanentNode(node, chrome::GetBookmarkManagedFolderIcon(), menu,
                             &added_separator);
 }
 
 void BookmarkMenuDelegate::BuildMenuForSupervisedNode(MenuItemView* menu) {
   // Don't add a separator for this menu.
   bool added_separator = true;
   const BookmarkNode* node = GetManagedBookmarkService()->supervised_node();
-  BuildMenuForPermanentNode(node, IDR_BOOKMARK_BAR_FOLDER_SUPERVISED, menu,
-                            &added_separator);
+  BuildMenuForPermanentNode(node, chrome::GetBookmarkSupervisedFolderIcon(),
+                            menu, &added_separator);
 }
 
 void BookmarkMenuDelegate::BuildMenu(const BookmarkNode* parent,
                                      int start_child_index,
                                      MenuItemView* menu) {
   DCHECK(parent->empty() || start_child_index < parent->child_count());
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   for (int i = start_child_index; i < parent->child_count(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
     const int id = next_menu_id_++;
     MenuItemView* child_menu_item;
     if (node->is_url()) {
       const gfx::Image& image = GetBookmarkModel()->GetFavicon(node);
       const gfx::ImageSkia* icon = image.IsEmpty() ?
           rb->GetImageSkiaNamed(IDR_DEFAULT_FAVICON) : image.ToImageSkia();
       child_menu_item =
           menu->AppendMenuItemWithIcon(id, node->GetTitle(), *icon);
     } else {
       DCHECK(node->is_folder());
-      gfx::ImageSkia* folder_icon =
-          rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER);
-      child_menu_item =
-          menu->AppendSubMenuWithIcon(id, node->GetTitle(), *folder_icon);
+      child_menu_item = menu->AppendSubMenuWithIcon(
+          id, node->GetTitle(), chrome::GetBookmarkFolderIcon());
     }
     AddMenuToMaps(child_menu_item, node);
   }
 }
 
 void BookmarkMenuDelegate::AddMenuToMaps(MenuItemView* menu,
                                          const BookmarkNode* node) {
   menu_id_to_node_map_[menu->GetCommand()] = node;
   node_to_menu_map_[node] = menu;
 }