Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6631)

Unified Diff: chrome/browser/ui/bookmarks/bookmark_utils.cc

Issue 1319283004: Restore old bookmark bar folders on win non-MD. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698