Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in chromium/ subdirectories. We still build these files with PLATFORM(WIN) defined.

In this change, I also killed off LogWin.{h,cpp} since we don't use it.  So, you will see some changes related to that.

R=dglazkov,tony
Review URL: http://codereview.chromium.org/7419

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3427 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 62 insertions, 45 deletions

diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 37c0ec6..5c81d39 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -25,6 +25,8 @@ elif env['PLATFORM'] == 'posix':
   )
 
 input_files = [
+    '$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
+
     '$PORT_DIR/css/RGBColor.cpp',
 
     '$PORT_DIR/history/BackForwardList.cpp',
@@ -36,12 +38,34 @@ input_files = [
     '$PORT_DIR/page/Console.cpp',
     '$PORT_DIR/page/Location.cpp',
     '$PORT_DIR/page/Navigator.cpp',
+    '$PORT_DIR/page/chromium/AccessibilityObjectChromium.cpp',
+    '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp',
+    '$PORT_DIR/page/chromium/DragControllerChromium.cpp',
+    '$PORT_DIR/page/chromium/EventHandlerChromium.cpp',
+    '$PORT_DIR/page/chromium/FrameChromium.cpp',
 
-    '$PORT_DIR/platform/BString.cpp',
-    '$PORT_DIR/platform/FramelessScrollView.cpp',
     '$PORT_DIR/platform/GKURL.cpp',
-    '$PORT_DIR/platform/Language.cpp',
-    '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
+
+    '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp',
+    '$PORT_DIR/platform/chromium/ContextMenuChromium.cpp',
+    '$PORT_DIR/platform/chromium/CursorChromium.cpp',
+    '$PORT_DIR/platform/chromium/DragDataChromium.cpp',
+    '$PORT_DIR/platform/chromium/DragImageChromium.cpp',
+    '$PORT_DIR/platform/chromium/FileChooserChromium.cpp',
+    '$PORT_DIR/platform/chromium/FramelessScrollView.cpp',
+    '$PORT_DIR/platform/chromium/Language.cpp',
+    '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp',
+    '$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',
+    '$PORT_DIR/platform/chromium/TemporaryLinkStubs.cpp',
+    '$PORT_DIR/platform/chromium/TextBoundariesChromium.cpp',
+    '$PORT_DIR/platform/chromium/TextBreakIteratorInternalICUChromium.cpp',
+    '$PORT_DIR/platform/chromium/WidgetChromium.cpp',
 
     '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
     '$PORT_DIR/platform/graphics/ColorSkia.cpp',
@@ -83,17 +107,36 @@ input_files = [
     '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
     '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
 
-    '$PORT_DIR/platform/network/AuthenticationChallenge.cpp',
-    '$PORT_DIR/platform/network/DNS.cpp',
+    '$PORT_DIR/platform/network/chromium/AuthenticationChallengeChromium.cpp',
+    '$PORT_DIR/platform/network/chromium/CookieJarChromium.cpp',
+    '$PORT_DIR/platform/network/chromium/DNSChromium.cpp',
+    '$PORT_DIR/platform/network/chromium/NetworkStateNotifierChromium.cpp',
 
-    '$PORT_DIR/plugins/PluginDataChromium.cpp',
+    '$PORT_DIR/plugins/chromium/PluginDataChromium.cpp',
 ]
 
 if env['PLATFORM'] in ('posix', 'darwin'):
   # Remove from the list files that haven't yet been made portable
   # to Mac and Linux.
   remove_files = [
-    '$PORT_DIR/platform/BString.cpp',
+    '$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
+    '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp',
+    '$PORT_DIR/platform/chromium/ContextMenuChromium.cpp',
+    '$PORT_DIR/platform/chromium/CursorChromium.cpp',
+    '$PORT_DIR/platform/chromium/DragDataChromium.cpp',
+    '$PORT_DIR/platform/chromium/DragImageChromium.cpp',
+    '$PORT_DIR/platform/chromium/FileChooserChromium.cpp',
+    '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp',
+    '$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',
+    '$PORT_DIR/platform/chromium/TextBoundariesChromium.cpp',
+    '$PORT_DIR/platform/chromium/TextBreakIteratorInternalICUChromium.cpp',
+    '$PORT_DIR/platform/chromium/WidgetChromium.cpp',
     '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
     '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
     '$PORT_DIR/platform/graphics/ImageSkia.cpp',
@@ -106,42 +149,18 @@ if env['PLATFORM'] in ('posix', 'darwin'):
 if env['PLATFORM'] == 'win32':
   # These are win32 specific and will never be ported.
   input_files.extend([
-    '$PORT_DIR/bridge/FrameWin.cpp',
-    '$PORT_DIR/bridge/PageWin.cpp',
-    '$PORT_DIR/bridge/PluginsWin.cpp',
-    '$PORT_DIR/page/AccessibilityObjectWin.cpp',
-    '$PORT_DIR/page/AXObjectCacheWin.cpp',
-    '$PORT_DIR/page/DragControllerWin.cpp',
-    '$PORT_DIR/page/EventHandlerWin.cpp',
-    '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
-    '$PORT_DIR/platform/ClipboardWin.cpp',
-    '$PORT_DIR/platform/ContextMenuItemWin.cpp',
-    '$PORT_DIR/platform/ContextMenuWin.cpp',
-    '$PORT_DIR/platform/CursorWin.cpp',
-    '$PORT_DIR/platform/DragDataWin.cpp',
-    '$PORT_DIR/platform/DragImageWin.cpp',
-    '$PORT_DIR/platform/EditorWin.cpp',
-    '$PORT_DIR/platform/FileChooserWin.cpp',
-    '$PORT_DIR/platform/KeyEventWin.cpp',
-    '$PORT_DIR/platform/LogWin.cpp',
-    '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
-    '$PORT_DIR/platform/PasteboardWin.cpp',
-    '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
-    '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
-    '$PORT_DIR/platform/PopupMenuWin.cpp',
-    '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
-    '$PORT_DIR/platform/ScreenWin.cpp',
-    '$PORT_DIR/platform/ScrollViewWin.cpp',
-    '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
-    '$PORT_DIR/platform/SharedTimerWin.cpp',
-    '$PORT_DIR/platform/SoundWin.cpp',
-    '$PORT_DIR/platform/SystemTimeWin.cpp',
-    '$PORT_DIR/platform/TextBoundariesWin.cpp',
-    '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
+    '$PORT_DIR/platform/win/BString.cpp',
+    '$PORT_DIR/platform/win/ClipboardUtilitiesWin.cpp',
+    '$PORT_DIR/platform/win/ClipboardWin.cpp',
+    '$PORT_DIR/platform/win/EditorWin.cpp',
+    '$PORT_DIR/platform/win/KeyEventWin.cpp',
+    '$PORT_DIR/platform/win/PasteboardWin.cpp',
+    '$PORT_DIR/platform/win/PlatformMouseEventWin.cpp',
+    '$PORT_DIR/platform/win/ScreenWin.cpp',
+    '$PORT_DIR/platform/win/SoundWin.cpp',
     '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
-    '$PORT_DIR/platform/WCDataObject.cpp',
-    '$PORT_DIR/platform/WheelEventWin.cpp',
-    '$PORT_DIR/platform/WidgetWin.cpp',
+    '$PORT_DIR/platform/win/WCDataObject.cpp',
+    '$PORT_DIR/platform/win/WheelEventWin.cpp',
     '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
     '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
     '$PORT_DIR/platform/graphics/FontWin.cpp',
@@ -151,8 +170,6 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/graphics/IntRectWin.cpp',
     '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
     '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
-    '$PORT_DIR/platform/network/CookieJarWin.cpp',
-    '$PORT_DIR/platform/network/NetworkStateNotifierWin.cpp',
     '$PORT_DIR/rendering/RenderThemeWin.cpp',
   ])