Move around more vector icons.

chrome/browser/ui/bookmarks/bookmark_utils.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/bookmarks/bookmark_utils.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 14 matching lines @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drop_target_event.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension_set.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #endif
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
@@ skipping 40 matching lines @@
     }
   }
 
   if (removed)
     return BOOKMARK_SHORTCUT_DISPOSITION_REMOVED;
 #endif
   return BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED;
 }
 
 #if defined(TOOLKIT_VIEWS) && !defined(OS_WIN)
-gfx::ImageSkia GetFolderIcon(gfx::VectorIconId id, SkColor text_color) {
-  return gfx::CreateVectorIcon(id,
+gfx::ImageSkia GetFolderIcon(const gfx::VectorIcon& icon, SkColor text_color) {
+  return gfx::CreateVectorIcon(icon,
                                color_utils::DeriveDefaultIconColor(text_color));
 }
 #endif
 
 }  // namespace
 
 GURL GetURLToBookmark(content::WebContents* web_contents) {
   DCHECK(web_contents);
   return search::IsInstantNTP(web_contents) ? GURL(kChromeUINewTabURL)
                                             : web_contents->GetURL();
@@ skipping 181 matching lines @@
   return true;
 }
 
 #if defined(TOOLKIT_VIEWS)
 // TODO(bsep): vectorize the Windows versions: crbug.com/564112
 gfx::ImageSkia GetBookmarkFolderIcon(SkColor text_color) {
 #if defined(OS_WIN)
   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BOOKMARK_BAR_FOLDER);
 #else
-  return GetFolderIcon(gfx::VectorIconId::FOLDER, text_color);
+  return GetFolderIcon(kFolderIcon, text_color);
 #endif
 }
 
 gfx::ImageSkia GetBookmarkSupervisedFolderIcon(SkColor text_color) {
 #if defined(OS_WIN)
   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BOOKMARK_BAR_FOLDER_SUPERVISED);
 #else
-  return GetFolderIcon(gfx::VectorIconId::FOLDER_SUPERVISED, text_color);
+  return GetFolderIcon(kFolderSupervisedIcon, text_color);
 #endif
 }
 
 gfx::ImageSkia GetBookmarkManagedFolderIcon(SkColor text_color) {
 #if defined(OS_WIN)
   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BOOKMARK_BAR_FOLDER_MANAGED);
 #else
-  return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED, text_color);
+  return GetFolderIcon(kFolderManagedIcon, text_color);
 #endif
 }
 #endif
 
 }  // namespace chrome