diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-13 00:53:18 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-13 00:53:18 +0000 |
| commit | 89ed01c883dabd07d5e4cf760a290ce682cbf34d (patch) | |
| tree | dec1237ef5fbcfc99f889dd09ae41c1125014a38 /skia | |
| parent | 16adb28574253284c920079a6800a7cc192c8dc4 (diff) | |
| download | chromium_src-89ed01c883dabd07d5e4cf760a290ce682cbf34d.zip chromium_src-89ed01c883dabd07d5e4cf760a290ce682cbf34d.tar.gz chromium_src-89ed01c883dabd07d5e4cf760a290ce682cbf34d.tar.bz2 | |
Add favicons to Mac bookmark bar.
BUG=8381
TEST=Open bookmark bar (Cmd-B). Add some bookmarks with sites that
have favicons (cnn.com). See icons in bookmark buttons. Make sure
color is correct.
Review URL: http://codereview.chromium.org/125061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 9c3ad85..b9b0714 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -384,6 +384,9 @@ #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp', '../third_party/skia/src/ports/sk_predefined_gamma.h', + '../third_party/skia/src/include/utils/mac/SkCGUtils.h', + '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp', + '../third_party/skia/include/core/Sk64.h', '../third_party/skia/include/core/SkAutoKern.h', '../third_party/skia/include/core/SkBitmap.h', @@ -555,7 +558,9 @@ ], 'conditions': [ [ 'OS != "mac"', { - 'sources/': [ ['exclude', '_mac\\.(cc|cpp)$'] ], + 'sources/': [ + ['exclude', '_mac\\.(cc|cpp)$'], + ['exclude', '/mac/'] ], }], [ 'OS != "linux"', { 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ], @@ -601,6 +606,9 @@ 'defines': [ 'SK_BUILD_FOR_MAC', ], + 'include_dirs': [ + '../third_party/skia/include/utils/mac', + ], }], [ 'OS == "win"', { 'sources!': [ |