Stick with old yellow bookmark folder icons on Windows, even in MD.

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 75 matching lines @@
       removed = true;
     }
   }
 
   if (removed)
     return BOOKMARK_SHORTCUT_DISPOSITION_REMOVED;
 #endif
   return BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED;
 }
 
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_WIN)
 gfx::ImageSkia GetFolderIcon(gfx::VectorIconId id, SkColor text_color) {
   return gfx::CreateVectorIcon(id,
                                color_utils::DeriveDefaultIconColor(text_color));
 }
 #endif
 
 }  // namespace
 
 GURL GetURLToBookmark(content::WebContents* web_contents) {
   DCHECK(web_contents);
@@ skipping 170 matching lines @@
       if (drop_parent->HasAncestor(node))
         return false;
     }
     return true;
   }
   // From another profile, always accept.
   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)
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-        IDR_BOOKMARK_BAR_FOLDER);
-  }
+  return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+      IDR_BOOKMARK_BAR_FOLDER);
+#else
+  return GetFolderIcon(gfx::VectorIconId::FOLDER, text_color);
 #endif
-
-  return GetFolderIcon(gfx::VectorIconId::FOLDER, text_color);
 }
 
 gfx::ImageSkia GetBookmarkSupervisedFolderIcon(SkColor text_color) {
 #if defined(OS_WIN)
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-        IDR_BOOKMARK_BAR_FOLDER_SUPERVISED);
-  }
+  return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+      IDR_BOOKMARK_BAR_FOLDER_SUPERVISED);
+#else
+  return GetFolderIcon(gfx::VectorIconId::FOLDER_SUPERVISED, text_color);
 #endif
-
-  return GetFolderIcon(gfx::VectorIconId::FOLDER_SUPERVISED, text_color);
 }
 
 gfx::ImageSkia GetBookmarkManagedFolderIcon(SkColor text_color) {
 #if defined(OS_WIN)
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-        IDR_BOOKMARK_BAR_FOLDER_MANAGED);
-  }
+  return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+      IDR_BOOKMARK_BAR_FOLDER_MANAGED);
+#else
+  return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED, text_color);
 #endif
-
-  return GetFolderIcon(gfx::VectorIconId::FOLDER_MANAGED, text_color);
 }
 #endif
 
 }  // namespace chrome