Restore old bookmark bar folders on win non-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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 27 matching lines @@
 #include "extensions/common/extension_set.h"
 #endif
 
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #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;
 
 namespace chrome {
 
 int num_bookmark_urls_before_prompting = 15;
 
 namespace {
 
 // The ways in which extensions may customize the bookmark shortcut.
@@ skipping 434 matching lines @@
         return false;
     }
     return true;
   }
   // From another profile, always accept.
   return true;
 }
 
 #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
 
 }  // namespace chrome