diff options
| author | eseidel@chromium.org <eseidel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 00:21:36 +0000 |
|---|---|---|
| committer | eseidel@chromium.org <eseidel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 00:21:36 +0000 |
| commit | cdf7912ed25a0b7cbd94681e38a65cd89bff9f18 (patch) | |
| tree | 5b63abdd0dadda36bcb51e89a0445f90d8cee90d /webkit/build/WebCore | |
| parent | 4f3dc3751d69f9db1f8ef533a3335201b3bc78bc (diff) | |
| download | chromium_src-cdf7912ed25a0b7cbd94681e38a65cd89bff9f18.zip chromium_src-cdf7912ed25a0b7cbd94681e38a65cd89bff9f18.tar.gz chromium_src-cdf7912ed25a0b7cbd94681e38a65cd89bff9f18.tar.bz2 | |
WebKit Merge! (chrome part)
Review URL: http://codereview.chromium.org/27028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index c9704c3..3c1ba65 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -432,6 +432,7 @@ input_files = [ '$WEBCORE_DIR/page/chromium/FrameChromium.cpp', '$WEBCORE_DIR/platform/Arena.cpp', + '$WEBCORE_DIR/platform/ContentType.cpp', '$WEBCORE_DIR/platform/ContextMenu.cpp', '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp', '$WEBCORE_DIR/platform/DragData.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 859401f..c477ceb 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -945,6 +945,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ContentType.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ContentType.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ContextMenu.cpp" > </File> |