diff options
| author | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 06:01:24 +0000 |
|---|---|---|
| committer | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 06:01:24 +0000 |
| commit | ce80b5c9c1a1ecfa965c3e7a8f8381140047fcea (patch) | |
| tree | aa10b2f3270c950685cef0d68c1114e692dcca5b /webkit/support/webkit_support.gypi | |
| parent | 014e6c5d3be7410f2c3d827da6ddb9d70720317b (diff) | |
| download | chromium_src-ce80b5c9c1a1ecfa965c3e7a8f8381140047fcea.zip chromium_src-ce80b5c9c1a1ecfa965c3e7a8f8381140047fcea.tar.gz chromium_src-ce80b5c9c1a1ecfa965c3e7a8f8381140047fcea.tar.bz2 | |
Add resource loading and resource retrieval code for Mac.
This changes will fix dozens of LayoutTest failures.
The code in platform_support_mac.mm is almost identical with test_shell_mac.mm.
test_webview_delegate.cc:
Revert a part of r40610. Depending from test_shell to
webkit_support.cc makes a symbol conflict because webkit_support.cc
depends on platform_support_mac.mm and platform_support_mac.mm has
webkit_glue::GetLocalizedString() and webkit_glue::GetDataResource(),
which are defined in test_shell too.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2002007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/webkit_support.gypi')
| -rw-r--r-- | webkit/support/webkit_support.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index 40caa8e..ec34cda 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -17,6 +17,9 @@ 'database', 'glue', ], + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit + ], 'sources': [ 'default_plugin_stubs_win.cc', 'platform_support.h', |