summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 13:58:34 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 13:58:34 +0000
commitef8ca82edcb77b5c78fbe8c3a87338713ad72890 (patch)
treee79e17383340ed975b68a235f292f57dda1eea6d /webkit/tools/test_shell
parent2f66e8ce0f3ac83e5dbc80bfa52760bb1a903ced (diff)
downloadchromium_src-ef8ca82edcb77b5c78fbe8c3a87338713ad72890.zip
chromium_src-ef8ca82edcb77b5c78fbe8c3a87338713ad72890.tar.gz
chromium_src-ef8ca82edcb77b5c78fbe8c3a87338713ad72890.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@19244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp5
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 ],