diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:16:39 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:16:39 +0000 |
| commit | 3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a (patch) | |
| tree | b7e5e5277693298bcfaf1c3149e34a2789636314 /webkit/tools/test_shell | |
| parent | 291d87ee329b9283c74125bbd933f19e629dcac1 (diff) | |
| download | chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.zip chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.tar.gz chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.tar.bz2 | |
Add favicons to tabs on the Mac. Also moved SkBitmapToNSImage() to
skia/ext/skia_utils_mac.h and removed chrome/browser/cocoa/cocoa_utils.h.
Patch by rsesek.
BUG=13565
http://codereview.chromium.org/131018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index c57a376..e28e690 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -522,7 +522,10 @@ '../webcore_unit_tests/XBMImageDecoder_unittest.cpp', 'image_decoder_unittest.cc', 'image_decoder_unittest.h', - ] + ], + 'sources': [ + '../../../skia/ext/skia_utils_mac_unittest.mm', + ], }], ['OS=="win"', { 'msvs_disabled_warnings': [ 4800 ], |