summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 18:24:56 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 18:24:56 +0000
commit7c0a454c173033290358a827f9f22842c626284a (patch)
tree4ffcad911328e28a20751ac0ce6bb382096af889
parentdaef1ceb8a464f48c133eac37699a41a1b24c8ca (diff)
downloadchromium_src-7c0a454c173033290358a827f9f22842c626284a.zip
chromium_src-7c0a454c173033290358a827f9f22842c626284a.tar.gz
chromium_src-7c0a454c173033290358a827f9f22842c626284a.tar.bz2
Only embed open_sans.woff on Linux.
BUG=none Review URL: https://chromiumcodereview.appspot.com/9465033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123761 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/shared_resources.grd2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 59eddf3..fe07683 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -163,8 +163,10 @@ without changes to the corresponding grd file. -->
file="shared/js/parse_html_subset.js" type="BINDATA" />
<include name="IDR_SHARED_JS_UTIL"
file="shared/js/util.js" type="BINDATA" />
+<if expr="is_posix and not is_macosx and not pp_ifdef('chromeos')">
<include name="IDR_THIRD_PARTY_FONTS_OPEN_SANS"
file="third_party/fonts/open_sans.woff" type="BINDATA" />
+</if>
</includes>
</release>
</grit>