From 189fdb77c97aad68fe72d4594b995a4db926c4a4 Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 11 Nov 2009 17:54:28 +0000
Subject: Cole sent me an icon that we'll use in the near term. Longer-term, we
 should figure out how to use the system icon without regressing startup time.

BUG=26457
TEST=Look at bookmarks bar. The folder icon, while not being the system folder icon, is at least blue.

Review URL: http://codereview.chromium.org/389012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31672 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/theme/bookmark_bar_folder_mac.png | Bin 0 -> 1345 bytes
 chrome/app/theme/theme_resources.grd         |   7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 chrome/app/theme/bookmark_bar_folder_mac.png

(limited to 'chrome/app')

diff --git a/chrome/app/theme/bookmark_bar_folder_mac.png b/chrome/app/theme/bookmark_bar_folder_mac.png
new file mode 100644
index 0000000..ec5d21f
Binary files /dev/null and b/chrome/app/theme/bookmark_bar_folder_mac.png differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index f76f977..ec78c5a 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -240,7 +240,12 @@
       <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" />
       <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" type="BINDATA" />
-      <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" type="BINDATA" />
+      <if expr="os != 'darwin'">
+        <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" type="BINDATA" />
+      </if>
+      <if expr="os == 'darwin'">
+        <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" />
+      </if>
       <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA" />
       <include name="IDR_OTR_ICON_STANDALONE" file="otr_icon_standalone.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_MANAGER_RECENT_ICON" file="bookmark_manager_recent.png" type="BINDATA" />
-- 
cgit v1.1