diff options
author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 20:23:44 +0000 |
---|---|---|
committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 20:23:44 +0000 |
commit | 477f7f4fbee00103bf512362656cfd6143ee082b (patch) | |
tree | 37eb78255ffd524a5f8c6a96a6ca4020e4ca0eae /webkit | |
parent | 3ce3e04f248adb3f440493bdae9c303433bc1fc2 (diff) | |
download | chromium_src-477f7f4fbee00103bf512362656cfd6143ee082b.zip chromium_src-477f7f4fbee00103bf512362656cfd6143ee082b.tar.gz chromium_src-477f7f4fbee00103bf512362656cfd6143ee082b.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
Review URL: http://codereview.chromium.org/131018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-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 ec42d92..ec3b871e 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -521,7 +521,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 ], |