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

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

Issue 1306873006: Fix mac_views_browser=1 compile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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
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..6e91d795c30f4033f472d44b8b6982e183279f00 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -38,7 +38,7 @@
#include "extensions/common/extension_set.h"
#endif
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(TOOLKIT_VIEWS)
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
#include "ui/native_theme/common_theme.h"
@@ -204,7 +204,7 @@ BookmarkShortcutDisposition GetBookmarkShortcutDisposition(Profile* profile) {
return BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED;
}
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(TOOLKIT_VIEWS)
gfx::ImageSkia GetFolderIcon(gfx::VectorIconId id) {
SkColor icon_color;
ui::CommonThemeGetSystemColor(ui::NativeTheme::kColorId_ChromeIconGrey,
@@ -497,7 +497,7 @@ bool IsValidBookmarkDropLocation(Profile* profile,
return true;
}
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(TOOLKIT_VIEWS)
gfx::ImageSkia GetBookmarkFolderIcon() {
return GetFolderIcon(gfx::VectorIconId::FOLDER);
}
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils.h ('k') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698