| Index: chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| index 759bc0e511e0f654d63a3153bbeb97aec99b2abd..0c0e166bae9d7307ec1400d60e6bc4dbe266fbcd 100644
|
| --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| @@ -45,6 +45,12 @@
|
| #include "ui/native_theme/native_theme.h"
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| +#include "chrome/grit/theme_resources.h"
|
| +#include "ui/base/resource/material_design/material_design_controller.h"
|
| +#include "ui/base/resource/resource_bundle.h"
|
| +#endif
|
| +
|
| using bookmarks::BookmarkModel;
|
| using bookmarks::BookmarkNode;
|
|
|
| @@ -499,14 +505,35 @@ bool IsValidBookmarkDropLocation(Profile* profile,
|
|
|
| #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| gfx::ImageSkia GetBookmarkFolderIcon() {
|
| +#if defined(OS_WIN)
|
| + if (!ui::MaterialDesignController::IsModeMaterial()) {
|
| + return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| + IDR_BOOKMARK_BAR_FOLDER);
|
| + }
|
| +#endif
|
| +
|
| return GetFolderIcon(gfx::VectorIconId::FOLDER);
|
| }
|
|
|
| gfx::ImageSkia GetBookmarkSupervisedFolderIcon() {
|
| +#if defined(OS_WIN)
|
| + if (!ui::MaterialDesignController::IsModeMaterial()) {
|
| + return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| + IDR_BOOKMARK_BAR_FOLDER_SUPERVISED);
|
| + }
|
| +#endif
|
| +
|
| return GetFolderIcon(gfx::VectorIconId::FOLDER_SUPERVISED);
|
| }
|
|
|
| gfx::ImageSkia GetBookmarkManagedFolderIcon() {
|
| +#if defined(OS_WIN)
|
| + if (!ui::MaterialDesignController::IsModeMaterial()) {
|
| + return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| + IDR_BOOKMARK_BAR_FOLDER_MANAGED);
|
| + }
|
| +#endif
|
| +
|
| return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED);
|
| }
|
| #endif
|
|
|