summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript.port
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 18:48:28 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 18:48:28 +0000
commit074ff16d3029256a9585529cad5487c1ae6eb409 (patch)
treee4d57cd79c533507a632ebf70c8ea8850113a9fc /webkit/SConscript.port
parent332ff119039b7dd3ba3d1994dde0b077f015bc03 (diff)
downloadchromium_src-074ff16d3029256a9585529cad5487c1ae6eb409.zip
chromium_src-074ff16d3029256a9585529cad5487c1ae6eb409.tar.gz
chromium_src-074ff16d3029256a9585529cad5487c1ae6eb409.tar.bz2
Landing 36102:37604 merge on trunk
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript.port')
-rw-r--r--webkit/SConscript.port5
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 262960c..c93f33e 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -57,7 +57,6 @@ input_files = [
'$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp',
'$PORT_DIR/platform/chromium/PopupMenuChromium.cpp',
'$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp',
- '$PORT_DIR/platform/chromium/ScrollViewChromium.cpp',
'$PORT_DIR/platform/chromium/SearchPopupMenuChromium.cpp',
'$PORT_DIR/platform/chromium/SharedTimerChromium.cpp',
'$PORT_DIR/platform/chromium/SystemTimeChromium.cpp',
@@ -138,9 +137,7 @@ if env['PLATFORM'] == 'darwin':
'$PORT_DIR/page/chromium/EventHandlerChromium.cpp',
'$PORT_DIR/platform/chromium/CursorChromium.cpp',
'$PORT_DIR/platform/chromium/DragDataChromium.cpp',
- '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp',
'$PORT_DIR/platform/chromium/PopupMenuChromium.cpp',
- '$PORT_DIR/platform/chromium/ScrollViewChromium.cpp',
'$PORT_DIR/platform/chromium/WidgetChromium.cpp',
'$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
'$PORT_DIR/platform/graphics/ImageSkia.cpp',
@@ -157,7 +154,7 @@ if env['PLATFORM'] == 'win32':
'$PORT_DIR/platform/win/ClipboardWin.cpp',
'$PORT_DIR/platform/win/EditorWin.cpp',
'$PORT_DIR/platform/win/PasteboardWin.cpp',
- '$PORT_DIR/platform/win/ScreenWin.cpp',
+ '$PORT_DIR/platform/win/PlatformScreenWin.cpp',
'$PORT_DIR/platform/win/SoundWin.cpp',
'$PORT_DIR/platform/UniscribeStateTextRun.cpp',
'$PORT_DIR/platform/win/WCDataObject.cpp',