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

71 files changed, 472 insertions, 523 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',
   ])
 
diff --git a/webkit/build/glue/glue.vcproj b/webkit/build/glue/glue.vcproj
index aab75ce..8524d3c 100644
--- a/webkit/build/glue/glue.vcproj
+++ b/webkit/build/glue/glue.vcproj
@@ -461,7 +461,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\glue\resource_handle_win.cc"
+				RelativePath="..\..\glue\resource_handle_impl.cc"
 				>
 			</File>
 			<File
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index f639845..e0af098 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -184,29 +184,37 @@
 			Name="page"
 			>
 			<File
-				RelativePath="..\..\port\page\AccessibilityObjectWin.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\port\page\AccessibilityObjectWrapperWin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\port\page\AXObjectCacheWin.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\port\page\Console.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\port\page\DragControllerWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\page\EventHandlerWin.cpp"
+			<Filter
+				Name="chromium"
 				>
-			</File>
+				<File
+					RelativePath="..\..\port\page\chromium\AccessibilityObjectChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\page\chromium\AXObjectCacheChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\page\chromium\DragControllerChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\page\chromium\EventHandlerChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\page\chromium\FrameChromium.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="inspector"
@@ -672,158 +680,14 @@
 			Name="platform"
 			>
 			<File
-				RelativePath="..\..\port\platform\BString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\BString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ClipboardUtilitiesWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ClipboardUtilitiesWin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ClipboardWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ClipboardWin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\COMPtr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ContextMenuItemWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ContextMenuWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\CursorWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\DragDataWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\DragImageWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\EditorWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\FileChooserWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\FramelessScrollView.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\FramelessScrollView.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\port\platform\GKURL.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\port\platform\KeyEventWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\Language.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\LogWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\LogWin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\MimeTypeRegistryWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\PasteboardWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\PlatformMouseEventWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\PlatformScrollBar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\PlatformScrollBarWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\PopupMenuWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ScreenWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\ScrollViewWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\SearchPopupMenuWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\SharedTimerWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\SoundWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\SSLKeyGeneratorWin.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\port\platform\StateTrackingString.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\port\platform\SystemTimeWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\TemporaryLinkStubs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\TextBoundariesWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\TextBreakIteratorInternalICUWin.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\port\platform\ThemeData.h"
 				>
 			</File>
@@ -835,26 +699,170 @@
 				RelativePath="..\..\port\platform\UniscribeStateTextRun.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\port\platform\WCDataObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\WCDataObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\WheelEventWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\WidgetClientWin.h"
+			<Filter
+				Name="win"
 				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\WidgetWin.cpp"
+				<File
+					RelativePath="..\..\port\platform\win\BString.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\BString.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\ClipboardUtilitiesWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\ClipboardUtilitiesWin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\ClipboardWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\ClipboardWin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\COMPtr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\EditorWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\KeyEventWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\PasteboardWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\PlatformMouseEventWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\ScreenWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\SoundWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\WCDataObject.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\WCDataObject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\win\WheelEventWin.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="chromium"
 				>
-			</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\ContextMenuChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\ContextMenuItemChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\CursorChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\DragDataChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\DragImageChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\FileChooserChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\FramelessScrollView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\FramelessScrollView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\Language.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\MimeTypeRegistryChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\PlatformScrollBar.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\PlatformScrollBarChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\PopupMenuChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\ScrollViewChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\SearchPopupMenuChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\SharedTimerChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\SSLKeyGeneratorChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\SystemTimeChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\TemporaryLinkStubs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\TextBoundariesChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\TextBreakIteratorInternalICUChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\WidgetChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\port\platform\chromium\WidgetClientChromium.h"
+					>
+				</File>
+			</Filter>
 			<Filter
 				Name="graphics"
 				>
@@ -863,6 +871,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\port\platform\graphics\BitmapImageSingleFrameSkia.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\port\platform\graphics\ColorSkia.cpp"
 					>
 				</File>
@@ -919,10 +931,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\port\platform\graphics\BitmapImageSingleFrameSkia.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\port\platform\graphics\IconWin.cpp"
 					>
 				</File>
@@ -1158,43 +1166,55 @@
 			<Filter
 				Name="network"
 				>
-				<File
-					RelativePath="..\..\port\platform\network\AuthenticationChallenge.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\network\AuthenticationChallenge.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\network\CookieJarWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\network\DNS.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\network\NetworkStateNotifierWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\network\ResourceError.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\network\ResourceRequest.h"
+				<Filter
+					Name="chromium"
 					>
-				</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\AuthenticationChallenge.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\AuthenticationChallengeChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\CookieJarChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\DNSChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\NetworkStateNotifierChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\ResourceError.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\ResourceRequest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\network\chromium\ResourceResponse.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="plugins"
 			>
-			<File
-				RelativePath="..\..\port\plugins\PluginDataChromium.cpp"
+			<Filter
+				Name="chromium"
 				>
-			</File>
+				<File
+					RelativePath="..\..\port\plugins\chromium\PluginDataChromium.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="rendering"
@@ -1212,17 +1232,17 @@
 			Name="bridge"
 			>
 			<File
-				RelativePath="..\..\port\bridge\FrameWin.cpp"
+				RelativePath="..\..\pending\ScriptController.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\port\bridge\PageWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\bridge\PluginsWin.cpp"
+			<Filter
+				Name="chromium"
 				>
-			</File>
+				<File
+					RelativePath="..\..\port\bridge\chromium\PluginsChromium.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="history"
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index d3db71f..2e676fc 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\platform;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\platform\network\win;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins"
 	/>
 </VisualStudioPropertySheet>
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index 471c430..d840423 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -6,7 +6,7 @@
 #define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H__
 
 #pragma warning(push, 0)
-#include "ChromeClientWin.h"
+#include "ChromeClientChromium.h"
 #pragma warning(pop)
 
 class WebViewImpl;
@@ -16,7 +16,7 @@ namespace WebCore {
 }
 
 // Handles window-level notifications from WebCore on behalf of a WebView.
-class ChromeClientImpl : public WebCore::ChromeClientWin {
+class ChromeClientImpl : public WebCore::ChromeClientChromium {
 public:
   ChromeClientImpl(WebViewImpl* webview);
   virtual ~ChromeClientImpl();
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index ca8f372..31ed6a0 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -20,7 +20,6 @@
 #pragma warning(pop)
 
 #undef LOG
-
 #include "base/string_util.h"
 #include "webkit/glue/editor_client_impl.h"
 #include "webkit/glue/glue_util.h"
@@ -28,11 +27,6 @@
 #include "webkit/glue/webview.h"
 #include "webkit/glue/webview_impl.h"
 
-// The notImplemented() from NotImplemented.h is now being dragged in via
-// webview_impl.h.  We want the one from LogWin.h instead.
-#undef notImplemented
-#include "LogWin.h"
-
 // Arbitrary depth limit for the undo stack, to keep it from using
 // unbounded memory.  This is the maximum number of distinct undoable
 // actions -- unbroken stretches of typed characters are coalesced
@@ -105,25 +99,23 @@ bool EditorClientImpl::isContinuousSpellCheckingEnabled() {
 }
 
 void EditorClientImpl::toggleContinuousSpellChecking() {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 bool EditorClientImpl::isGrammarCheckingEnabled() {
-  notImplemented();
   return false;
 }
 
 void EditorClientImpl::toggleGrammarChecking() {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 int EditorClientImpl::spellCheckerDocumentTag() {
-  notImplemented();
+  NOTIMPLEMENTED();
   return 0;
 }
 
 bool EditorClientImpl::isEditable() {
-  notImplemented();
   return false;
 }
 
@@ -226,7 +218,7 @@ bool EditorClientImpl::shouldApplyStyle(WebCore::CSSStyleDeclaration* style,
 bool EditorClientImpl::shouldMoveRangeAfterDelete(
     WebCore::Range* /*range*/,
     WebCore::Range* /*rangeToBeReplaced*/) {
-  notImplemented();
+  NOTIMPLEMENTED();
   return true;
 }
 
@@ -282,11 +274,11 @@ void EditorClientImpl::didEndEditing() {
 }
 
 void EditorClientImpl::didWriteSelectionToPasteboard() {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::didSetSelectionTypesForPasteboard() {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::registerCommandForUndo(
@@ -562,17 +554,17 @@ void EditorClientImpl::handleKeyboardEvent(WebCore::KeyboardEvent* evt) {
 }
 
 void EditorClientImpl::handleInputMethodKeydown(WebCore::KeyboardEvent* keyEvent) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::textFieldDidBeginEditing(WebCore::Element*) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::textFieldDidEndEditing(WebCore::Element*) {
   // Notification that focus was lost.
   // Be careful with this, it's also sent when the page is being closed.
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::textDidChangeInTextField(WebCore::Element* element) {
@@ -591,36 +583,36 @@ bool EditorClientImpl::doTextFieldCommandFromEvent(WebCore::Element*,
 }
 
 void EditorClientImpl::textWillBeDeletedInTextField(WebCore::Element*) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::textDidChangeInTextArea(WebCore::Element*) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 #if defined(OS_MACOSX)
 // TODO(pinkerton): implement these when we get to copy/paste
 NSData* EditorClientImpl::dataForArchivedSelection(WebCore::Frame*) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 NSString* EditorClientImpl::userVisibleString(NSURL*) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 #ifdef BUILDING_ON_TIGER
 NSArray* EditorClientImpl::pasteboardTypesForSelection(WebCore::Frame*) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 #endif
 #endif
 
 void EditorClientImpl::ignoreWordInSpellDocument(const WebCore::String&) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::learnWord(const WebCore::String&) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::checkSpellingOfString(const UChar* str, int length,
@@ -652,7 +644,7 @@ void EditorClientImpl::checkGrammarOfString(const UChar*, int length,
                                             WTF::Vector<WebCore::GrammarDetail>&,
                                             int* badGrammarLocation,
                                             int* badGrammarLength) {
-  notImplemented();
+  NOTIMPLEMENTED();
   if (badGrammarLocation)
     *badGrammarLocation = 0;
   if (badGrammarLength)
@@ -661,15 +653,15 @@ void EditorClientImpl::checkGrammarOfString(const UChar*, int length,
 
 void EditorClientImpl::updateSpellingUIWithGrammarString(const WebCore::String&,
                                                          const WebCore::GrammarDetail& detail) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::updateSpellingUIWithMisspelledWord(const WebCore::String&) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::showSpellingUI(bool show) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 bool EditorClientImpl::spellingUIIsShowing() {
@@ -678,7 +670,7 @@ bool EditorClientImpl::spellingUIIsShowing() {
 
 void EditorClientImpl::getGuessesForWord(const WebCore::String&,
                                          WTF::Vector<WebCore::String>& guesses) {
-  notImplemented();
+  NOTIMPLEMENTED();
 }
 
 void EditorClientImpl::setInputMethodState(bool enabled) {
diff --git a/webkit/glue/resource_handle_win.cc b/webkit/glue/resource_handle_impl.cc
index 9b96b83..a841c1e 100644
--- a/webkit/glue/resource_handle_win.cc
+++ b/webkit/glue/resource_handle_impl.cc
@@ -31,7 +31,6 @@
 #include "DOMWindow.h"
 #include "FormData.h"
 #include "FrameLoader.h"
-#include "LogWin.h"
 #include "Page.h"
 #include "ResourceError.h"
 #include "ResourceHandle.h"
@@ -252,12 +251,12 @@ ResourceHandleInternal::ResourceHandleInternal(ResourceHandle* job,
     : job_(job),
       client_(c),
       request_(r),
-MSVC_SUPPRESS_WARNING(4355)  // can use this
-      data_url_factory_(this),
       load_flags_(net::LOAD_NORMAL),
       pending_(false),
       expected_content_length_(-1),
-      multipart_delegate_(NULL) {
+      multipart_delegate_(NULL),
+MSVC_SUPPRESS_WARNING(4355)  // can use this
+      data_url_factory_(this) {
 }
 
 ResourceHandleInternal::~ResourceHandleInternal() {
@@ -368,8 +367,6 @@ bool ResourceHandleInternal::Start(
     case ReturnCacheDataDontLoad:
       load_flags_ |= net::LOAD_ONLY_FROM_CACHE;
       break;
-    case UseProtocolCachePolicy:
-      break;
   }
 
   // TODO(jcampan): in the non out-of-process plugin case the request does not
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 316be1b..ba744b8 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -85,6 +85,7 @@
 #pragma warning(push, 0)
 #include "HTMLFormElement.h"  // need this before Document.h
 #include "Chrome.h"
+#include "ChromeClientChromium.h"
 #include "Console.h"
 #include "Document.h"
 #include "DocumentFragment.h"  // Only needed for ReplaceSelectionCommand.h :(
@@ -93,6 +94,7 @@
 #include "Editor.h"
 #include "EventHandler.h"
 #include "Frame.h"
+#include "FrameChromium.h"
 #include "FrameLoader.h"
 #include "FrameLoadRequest.h"
 #include "FrameTree.h"
@@ -110,9 +112,6 @@
 #include "RenderWidget.h"
 #include "ReplaceSelectionCommand.h"
 #include "ResourceHandle.h"
-#if defined(OS_WIN)
-#include "ResourceHandleWin.h"
-#endif
 #include "ResourceRequest.h"
 #include "ScriptController.h"
 #include "SelectionController.h"
@@ -121,6 +120,7 @@
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "TextAffinity.h"
+#include "WidgetClientChromium.h"
 #include "XPathResult.h"
 
 #pragma warning(pop)
@@ -144,14 +144,12 @@
 #include "webkit/glue/webhistoryitem_impl.h"
 #include "webkit/glue/webtextinput_impl.h"
 #include "webkit/glue/webview_impl.h"
-#include "webkit/port/page/ChromeClientWin.h"
-#include "webkit/port/platform/WidgetClientWin.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
-using WebCore::ChromeClientWin;
+using WebCore::ChromeClientChromium;
 using WebCore::Color;
 using WebCore::Document;
 using WebCore::DocumentFragment;
@@ -183,7 +181,7 @@ using WebCore::String;
 using WebCore::SubstituteData;
 using WebCore::TextIterator;
 using WebCore::VisiblePosition;
-using WebCore::WidgetClientWin;
+using WebCore::WidgetClientChromium;
 using WebCore::XPathResult;
 
 static const wchar_t* const kWebFrameActiveCount = L"WebFrameActiveCount";
@@ -282,7 +280,7 @@ MSVC_POP_WARNING()
     margin_height_(-1),
     inspected_node_(NULL),
     active_tickmark_frame_(NULL),
-    active_tickmark_(WidgetClientWin::kNoTickmark),
+    active_tickmark_(WidgetClientChromium::kNoTickmark),
     locating_active_rect_(false),
     last_active_range_(NULL),
     last_match_count_(-1),
@@ -890,7 +888,7 @@ bool WebFrameImpl::FindNext(const FindInPageRequest& request,
   WebFrameImpl* const active_frame = main_frame_impl->active_tickmark_frame_;
   RefPtr<WebCore::Range> old_tickmark = NULL;
   if (active_frame &&
-      (active_frame->active_tickmark_ != WidgetClientWin::kNoTickmark)) {
+      (active_frame->active_tickmark_ != WidgetClientChromium::kNoTickmark)) {
     // When we get a reference to |old_tickmark| we can be in a state where
     // the |active_tickmark_| points outside the tickmark vector, possibly
     // during teardown of the frame. This doesn't reproduce normally, so if you
@@ -906,7 +904,7 @@ bool WebFrameImpl::FindNext(const FindInPageRequest& request,
   // See if we have another match to select, and select it.
   if (request.forward) {
     const bool at_end = (active_tickmark_ == (tickmarks_.size() - 1));
-    if ((active_tickmark_ == WidgetClientWin::kNoTickmark) ||
+    if ((active_tickmark_ == WidgetClientChromium::kNoTickmark) ||
         (at_end && wrap_within_frame)) {
       // Wrapping within a frame is only done for single frame pages. So when we
       // reach the end we go back to the beginning (or back to the end if
@@ -920,7 +918,7 @@ bool WebFrameImpl::FindNext(const FindInPageRequest& request,
     }
   } else {
     const bool at_end = (active_tickmark_ == 0);
-    if ((active_tickmark_ == WidgetClientWin::kNoTickmark) ||
+    if ((active_tickmark_ == WidgetClientChromium::kNoTickmark) ||
         (at_end && wrap_within_frame)) {
       // Wrapping within a frame is not done for multi-frame pages, but if no
       // tickmark is active we still need to set the index to the end so that
@@ -937,7 +935,7 @@ bool WebFrameImpl::FindNext(const FindInPageRequest& request,
   if (active_frame != this) {
     // If we are jumping between frames, reset the active tickmark in the old
     // frame and invalidate the area.
-    active_frame->active_tickmark_ = WidgetClientWin::kNoTickmark;
+    active_frame->active_tickmark_ = WidgetClientChromium::kNoTickmark;
     active_frame->InvalidateArea(INVALIDATE_CONTENT_AREA);
     main_frame_impl->active_tickmark_frame_ = this;
   } else {
@@ -1227,7 +1225,7 @@ void WebFrameImpl::ScopeStringMatches(FindInPageRequest request,
 
 void WebFrameImpl::CancelPendingScopingEffort() {
   scope_matches_factory_.RevokeAll();
-  active_tickmark_ = WidgetClientWin::kNoTickmark;
+  active_tickmark_ = WidgetClientChromium::kNoTickmark;
 }
 
 void WebFrameImpl::SetFindEndstateFocusAndSelection() {
@@ -1235,7 +1233,7 @@ void WebFrameImpl::SetFindEndstateFocusAndSelection() {
       static_cast<WebFrameImpl*>(GetView()->GetMainFrame());
 
   if (this == main_frame_impl->active_tickmark_frame() &&
-      active_tickmark_ != WidgetClientWin::kNoTickmark) {
+      active_tickmark_ != WidgetClientChromium::kNoTickmark) {
     RefPtr<Range> range = tickmarks_[active_tickmark_];
 
     // Set the selection to what the active match is.
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 5d6fc66..d313def 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -23,7 +23,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "ImageSource.h"
 #endif
 #include "KURL.h"
-#include "LogWin.h"
 #include "Page.h"
 #include "PlatformString.h"
 #include "RenderTreeAsText.h"
@@ -33,7 +32,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
 MSVC_POP_WARNING();
 
 #undef LOG
-#undef notImplemented
 #include "webkit/glue/webkit_glue.h"
 
 #include "base/file_version_info.h"
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index ad8f662..0e09bf9 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -19,7 +19,7 @@
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "webkit/port/history/BackForwardList.h"
-#include "webkit/port/platform/WidgetClientWin.h"
+#include "webkit/port/platform/chromium/WidgetClientChromium.h"
 MSVC_POP_WARNING();
 
 namespace WebCore {
@@ -42,7 +42,7 @@ class WebMouseWheelEvent;
 class WebViewDelegate;
 
 class WebViewImpl : public WebView,
-                    public WebCore::WidgetClientWin,
+                    public WebCore::WidgetClientChromium,
                     public WebCore::BackForwardListClient {
  public:
   // WebView
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index ddb4fde..2c7ced3 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -12,7 +12,7 @@
 #include "webkit/glue/webwidget.h"
 
 #pragma warning(push, 0)
-#include "WidgetClientWin.h"
+#include "WidgetClientChromium.h"
 #pragma warning(pop)
 
 namespace WebCore {
@@ -30,7 +30,7 @@ class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebWidgetDelegate;
 
-class WebWidgetImpl : public WebWidget, public WebCore::WidgetClientWin {
+class WebWidgetImpl : public WebWidget, public WebCore::WidgetClientChromium {
  public:
   // WebWidget
   virtual void Close();
diff --git a/webkit/port/bridge/PluginsWin.cpp b/webkit/port/bridge/chromium/PluginsChromium.cpp
index ef7572a..ef7572a 100644
--- a/webkit/port/bridge/PluginsWin.cpp
+++ b/webkit/port/bridge/chromium/PluginsChromium.cpp
diff --git a/webkit/port/page/AXObjectCacheWin.cpp b/webkit/port/page/chromium/AXObjectCacheChromium.cpp
index da30ac5..da30ac5 100644
--- a/webkit/port/page/AXObjectCacheWin.cpp
+++ b/webkit/port/page/chromium/AXObjectCacheChromium.cpp
diff --git a/webkit/port/page/AccessibilityObjectWin.cpp b/webkit/port/page/chromium/AccessibilityObjectChromium.cpp
index e309ac8..e309ac8 100644
--- a/webkit/port/page/AccessibilityObjectWin.cpp
+++ b/webkit/port/page/chromium/AccessibilityObjectChromium.cpp
diff --git a/webkit/port/page/ChromeClientWin.h b/webkit/port/page/chromium/ChromeClientChromium.h
index cb40e43..2e04c39 100644
--- a/webkit/port/page/ChromeClientWin.h
+++ b/webkit/port/page/chromium/ChromeClientChromium.h
@@ -15,7 +15,7 @@ namespace WebCore {
     class Frame;
     class String;
     
-    class ChromeClientWin : public ChromeClient {
+    class ChromeClientChromium : public ChromeClient {
     public:
         // Opens the file selection dialog.
         virtual void runFileChooser(const String& defaultFileName,
diff --git a/webkit/port/page/DragControllerWin.cpp b/webkit/port/page/chromium/DragControllerChromium.cpp
index 41f3008..ac73890 100644
--- a/webkit/port/page/DragControllerWin.cpp
+++ b/webkit/port/page/chromium/DragControllerChromium.cpp
@@ -27,10 +27,13 @@
 #include "DragController.h"
 
 #include "DragData.h"
-#include "windows.h" 
 #include "SelectionController.h"
 #include <wtf/RefPtr.h>
 
+#if PLATFORM(WIN)
+#include <windows.h>
+#endif
+
 namespace WebCore {
 
 const int DragController::LinkDragBorderInset = 2;
@@ -51,7 +54,13 @@ DragOperation DragController::dragOperation(DragData* dragData)
 }
 
 bool DragController::isCopyKeyDown() {
+    // TODO(darin): This should not be OS specific.  Delegate to the embedder
+    // instead.
+#if PLATFORM(WIN)
     return ::GetAsyncKeyState(VK_CONTROL);
+#else
+    return false;
+#endif
 }
     
 const IntSize& DragController::maxDragImageSize()
diff --git a/webkit/port/page/EventHandlerWin.cpp b/webkit/port/page/chromium/EventHandlerChromium.cpp
index 3e7476e5..fe95bad 100644
--- a/webkit/port/page/EventHandlerWin.cpp
+++ b/webkit/port/page/chromium/EventHandlerChromium.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "EventHandler.h"
 
-#include "ClipboardWin.h"
 #include "Cursor.h"
 #include "FloatPoint.h"
 #include "FocusController.h"
@@ -41,9 +40,13 @@
 #include "PlatformWheelEvent.h"
 #include "RenderWidget.h"
 #include "SelectionController.h"
-#include "WCDataObject.h"
 #include "NotImplemented.h"
 
+#if PLATFORM(WIN)
+#include "ClipboardWin.h"
+#include "WCDataObject.h"
+#endif
+
 namespace WebCore {
 
 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
@@ -136,9 +139,13 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
 
 PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
 {
+#if PLATFORM(WIN)
     COMPtr<WCDataObject> dataObject;
     WCDataObject::createInstance(&dataObject);
     return ClipboardWin::create(true, dataObject.get(), ClipboardWritable);
+#else
+    return PassRefPtr<Clipboard>(0);
+#endif
 }
 
 void EventHandler::focusDocumentView()
diff --git a/webkit/port/bridge/FrameWin.cpp b/webkit/port/page/chromium/FrameChromium.cpp
index 28375d0..991401e 100644
--- a/webkit/port/bridge/FrameWin.cpp
+++ b/webkit/port/page/chromium/FrameChromium.cpp
@@ -29,7 +29,7 @@
 #elif USE(V8)
 #include "npruntime_priv.h"
 #endif
-#include "FrameWin.h"
+#include "FrameChromium.h"
 
 #include "AffineTransform.h"
 #include "FloatRect.h"
diff --git a/webkit/port/bridge/FrameWin.h b/webkit/port/page/chromium/FrameChromium.h
index 7e3d5b8..c42c76a 100644
--- a/webkit/port/bridge/FrameWin.h
+++ b/webkit/port/page/chromium/FrameChromium.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef FrameWin_H
-#define FrameWin_H
+#ifndef FrameChromium_H
+#define FrameChromium_H
 
 #include "Frame.h"
 
diff --git a/webkit/port/page/win/FrameWin.h b/webkit/port/page/win/FrameWin.h
new file mode 100644
index 0000000..5990c05
--- /dev/null
+++ b/webkit/port/page/win/FrameWin.h
@@ -0,0 +1,2 @@
+// This file exists to make FramePrivate.h happy.  It should be deleted once we
+// stop defining PLATFORM(WIN) in the Windows build.
diff --git a/webkit/port/platform/LogWin.cpp b/webkit/port/platform/LogWin.cpp
deleted file mode 100644
index 583dbff..0000000
--- a/webkit/port/platform/LogWin.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2008, Google Inc.
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-// 
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "config.h"
-#include <windows.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#define LOG_ENABLE
-#include "LogWin.h"
-
-#include "glue/webkit_glue.h"
-
-namespace WebCore {
-
-#ifndef NDEBUG
-void __cdecl LogPrintf::operator()(const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-
-    char buf[512];
-    _vsnprintf(buf, sizeof(buf), fmt, args);
-
-    webkit_glue::AppendToLog(m_file, m_line, buf);
-
-    va_end(args);
-}
-#endif
-
-}  // namespace WebCore
diff --git a/webkit/port/platform/LogWin.h b/webkit/port/platform/LogWin.h
deleted file mode 100644
index dfbfb77..0000000
--- a/webkit/port/platform/LogWin.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// vim:set ts=4 sw=4 sts=4 cin et:
-//
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// This file defines a simple printf-style logging function that writes to the
-// debug console in visual studio.  To enable logging, define LOG_ENABLE before
-// including this header file.
-//
-// Usage:
-//
-//   {
-//     LOG(("foo bar: %d", blah()));
-//     ...
-//   }
-//
-// Parameters are only evaluated in debug builds.
-//
-#ifndef LogWin_h
-#define LogWin_h
-#undef LOG
-
-#if defined(LOG_ENABLE) && !defined(NDEBUG)
-namespace WebCore {
-    class LogPrintf {
-    public:
-        LogPrintf(const char* f, int l) : m_file(f), m_line(l) {}
-        void __cdecl operator()(const char* format, ...);
-    private:
-        const char* m_file;
-        int m_line;
-    };
-}
-#define LOG(args) WebCore::LogPrintf(__FILE__, __LINE__) args
-#else
-#define LOG(args)
-#endif
-
-// Log a console message if a function is not implemented.
-#ifndef notImplemented
-#define notImplemented() do { \
-  LOG(("FIXME: UNIMPLEMENTED %s()\n", __FUNCTION__)); \
-} while (0)
-#endif
-
-#endif
-
diff --git a/webkit/port/platform/ContextMenuWin.cpp b/webkit/port/platform/chromium/ContextMenuChromium.cpp
index 2861a5f..81c318d 100644
--- a/webkit/port/platform/ContextMenuWin.cpp
+++ b/webkit/port/platform/chromium/ContextMenuChromium.cpp
@@ -26,12 +26,6 @@
 #include "config.h"
 #include "ContextMenu.h"
 
-#include "CString.h"
-#include "Document.h"
-#include "Frame.h"
-#include "FrameView.h"
-#include "Node.h"
-
 namespace WebCore {
 
 // This is a stub implementation of WebKit's ContextMenu class that does
@@ -66,11 +60,6 @@ void ContextMenu::appendItem(ContextMenuItem& item)
 {
 }
 
-static ContextMenuItem* contextMenuItemByIdOrPosition(HMENU menu, unsigned id, BOOL byPosition)
-{
-    return 0;
-}
-
 ContextMenuItem* ContextMenu::itemWithAction(unsigned action)
 {
     return 0;
@@ -81,16 +70,16 @@ ContextMenuItem* ContextMenu::itemAtIndex(unsigned index, const PlatformMenuDesc
     return 0;
 }
 
-void ContextMenu::setPlatformDescription(HMENU menu)
+void ContextMenu::setPlatformDescription(PlatformMenuDescription menu)
 {
 }
 
-HMENU ContextMenu::platformDescription() const
+PlatformMenuDescription ContextMenu::platformDescription() const
 {
     return m_platformDescription;
 }
 
-HMENU ContextMenu::releasePlatformDescription()
+PlatformMenuDescription ContextMenu::releasePlatformDescription()
 {
     return 0;
 }
diff --git a/webkit/port/platform/ContextMenuItemWin.cpp b/webkit/port/platform/chromium/ContextMenuItemChromium.cpp
index ccf6cd9..1aab658 100644
--- a/webkit/port/platform/ContextMenuItemWin.cpp
+++ b/webkit/port/platform/chromium/ContextMenuItemChromium.cpp
@@ -28,14 +28,12 @@
 
 #include "ContextMenu.h"
 
-#include "CString.h"
-
 namespace WebCore {
 
 // This is a stub implementation of WebKit's ContextMenu class that does
 // nothing.
 
-ContextMenuItem::ContextMenuItem(LPMENUITEMINFO item)
+ContextMenuItem::ContextMenuItem(PlatformMenuItemDescription item)
 {
 }
 
@@ -51,7 +49,7 @@ ContextMenuItem::~ContextMenuItem()
 {
 }
 
-LPMENUITEMINFO ContextMenuItem::releasePlatformDescription()
+PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription()
 {
     return 0;
 }
diff --git a/webkit/port/platform/CursorWin.cpp b/webkit/port/platform/chromium/CursorChromium.cpp
index 884c464d..884c464d 100644
--- a/webkit/port/platform/CursorWin.cpp
+++ b/webkit/port/platform/chromium/CursorChromium.cpp
diff --git a/webkit/port/platform/DragDataWin.cpp b/webkit/port/platform/chromium/DragDataChromium.cpp
index 8deca48..cc53e09 100644
--- a/webkit/port/platform/DragDataWin.cpp
+++ b/webkit/port/platform/chromium/DragDataChromium.cpp
@@ -29,13 +29,16 @@
 #include "config.h"
 #include "DragData.h"
 
+#if PLATFORM(WIN)
 #include "ClipboardWin.h"
 #include "ClipboardUtilitiesWin.h"
+#include "WCDataObject.h"
+#endif
+
 #include "DocumentFragment.h"
 #include "KURL.h"
 #include "PlatformString.h"
 #include "Markup.h"
-#include "WCDataObject.h"
 
 #undef LOG
 #include "base/file_util.h"
@@ -65,6 +68,8 @@ namespace WebCore {
 
 PassRefPtr<Clipboard> DragData::createClipboard(ClipboardAccessPolicy policy) const
 {
+// TODO(darin): Invent ClipboardChromium and use that instead.
+#if PLATFORM(WIN)
     WCDataObject* data;
     WCDataObject::createInstance(&data);
     RefPtr<ClipboardWin> clipboard = ClipboardWin::create(true, data, policy);
@@ -73,6 +78,9 @@ PassRefPtr<Clipboard> DragData::createClipboard(ClipboardAccessPolicy policy) co
     data->Release();
 
     return clipboard.release();
+#else
+    return PassRefPtr<Clipboard>(0);
+#endif
 }
 
 bool DragData::containsURL() const
diff --git a/webkit/port/platform/DragImageWin.cpp b/webkit/port/platform/chromium/DragImageChromium.cpp
index 24fe371..e3bc70e 100644
--- a/webkit/port/platform/DragImageWin.cpp
+++ b/webkit/port/platform/chromium/DragImageChromium.cpp
@@ -30,17 +30,26 @@
 #include "GraphicsContext.h"
 #include "Image.h"
 
+#if PLATFORM(WIN)
 #include <windows.h>
+#endif
 
 namespace WebCore {
 
 IntSize dragImageSize(DragImageRef image)
 {
+// TODO(darin): DragImageRef should be changed to be a cross-platform
+// container.  However, it may still make sense for its contents to be
+// platform-dependent.
+#if PLATFORM(WIN)
     if (!image)
         return IntSize();
     BITMAP b;
     GetObject(image, sizeof(BITMAP), &b);
     return IntSize(b.bmWidth, b.bmHeight);
+#else
+    return IntSize();
+#endif
 }
 
 void deleteDragImage(DragImageRef image)
diff --git a/webkit/port/platform/FileChooserWin.cpp b/webkit/port/platform/chromium/FileChooserChromium.cpp
index 8497372..aed99d7 100644
--- a/webkit/port/platform/FileChooserWin.cpp
+++ b/webkit/port/platform/chromium/FileChooserChromium.cpp
@@ -27,12 +27,12 @@
 #include <shlwapi.h>
 
 #pragma warning(push, 0)
-#include "ChromeClientWin.h"
+#include "ChromeClientChromium.h"
 #include "Document.h"
 #include "Frame.h"
 #include "FileChooser.h"
-#include "Icon.h"
 #include "LocalizedStrings.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "StringTruncator.h"
 #pragma warning(pop)
@@ -45,8 +45,8 @@ void FileChooser::openFileChooser(Document* document)
     if (!frame)
         return;
 
-    ChromeClientWin* client =
-        static_cast<ChromeClientWin*>(frame->page()->chrome()->client());
+    ChromeClientChromium* client =
+        static_cast<ChromeClientChromium*>(frame->page()->chrome()->client());
 
     String result;
     client->runFileChooser(m_filename, &*this);
@@ -61,10 +61,15 @@ String FileChooser::basenameForWidth(const Font& font, int width) const
     if (m_filename.isEmpty())
         string = fileButtonNoFileSelectedLabel();
     else {
+#if PLATFORM(WIN_OS)
         String tmpFilename = m_filename;
         // Apple's code has a LPTSTR here, which will compile and run, but is wrong.
         wchar_t* basename = PathFindFileName(tmpFilename.charactersWithNullTermination());
         string = String(basename);
+#else
+        notImplemented();
+        string = "fixme";
+#endif
     }
 
     return StringTruncator::centerTruncate(string, static_cast<float>(width), font, false);
diff --git a/webkit/port/platform/FramelessScrollView.cpp b/webkit/port/platform/chromium/FramelessScrollView.cpp
index 8a40150..8a40150 100644
--- a/webkit/port/platform/FramelessScrollView.cpp
+++ b/webkit/port/platform/chromium/FramelessScrollView.cpp
diff --git a/webkit/port/platform/FramelessScrollView.h b/webkit/port/platform/chromium/FramelessScrollView.h
index a71fcfb..a71fcfb 100644
--- a/webkit/port/platform/FramelessScrollView.h
+++ b/webkit/port/platform/chromium/FramelessScrollView.h
diff --git a/webkit/port/bridge/PageWin.cpp b/webkit/port/platform/chromium/Language.cpp
index f4c744a..b21f7d4 100644
--- a/webkit/port/bridge/PageWin.cpp
+++ b/webkit/port/platform/chromium/Language.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,15 +24,25 @@
  */
 
 #include "config.h"
-#include "Page.h"
+#include "Language.h"
+
+#include "CString.h"
+#include "PlatformString.h"
+#include "webkit/glue/glue_util.h"
+#include "webkit/glue/webkit_glue.h"
 
-#include "Frame.h"
-#include "FrameView.h"
-#include "FloatRect.h"
-#include <windows.h>
 
 namespace WebCore {
 
-HINSTANCE Page::s_instanceHandle = 0;
+String defaultLanguage()
+{
+    static String computedDefaultLanguage;
+    if (!computedDefaultLanguage.isEmpty())
+        return computedDefaultLanguage;
+
+    computedDefaultLanguage =
+        webkit_glue::StdWStringToString(webkit_glue::GetWebKitLocale());
+    return computedDefaultLanguage;
+}
 
-} // namespace WebCore
+}
diff --git a/webkit/port/platform/MimeTypeRegistryWin.cpp b/webkit/port/platform/chromium/MimeTypeRegistryChromium.cpp
index a4eaa9f..a4eaa9f 100644
--- a/webkit/port/platform/MimeTypeRegistryWin.cpp
+++ b/webkit/port/platform/chromium/MimeTypeRegistryChromium.cpp
diff --git a/webkit/port/platform/PlatformScrollBar.h b/webkit/port/platform/chromium/PlatformScrollBar.h
index 4b3c17b..45ec726 100644
--- a/webkit/port/platform/PlatformScrollBar.h
+++ b/webkit/port/platform/chromium/PlatformScrollBar.h
@@ -32,10 +32,6 @@
 #include "ScrollBar.h"
 #include "Timer.h"
 
-namespace gfx {
-class PlatformCanvasWin;
-}
-
 namespace WebCore {
 
 // IMPORTANT NOTES ABOUT SCROLLBARS
diff --git a/webkit/port/platform/PlatformScrollBarWin.cpp b/webkit/port/platform/chromium/PlatformScrollBarChromium.cpp
index 723d321..ff75630 100644
--- a/webkit/port/platform/PlatformScrollBarWin.cpp
+++ b/webkit/port/platform/chromium/PlatformScrollBarChromium.cpp
@@ -39,7 +39,7 @@
 #include "PlatformScrollBar.h"
 #include "Range.h"
 #include "ScrollView.h"
-#include "WidgetClientWin.h"
+#include "WidgetClientChromium.h"
 
 #include "graphics/SkiaUtils.h"
 
@@ -141,8 +141,8 @@ void PlatformScrollbar::DrawTickmarks(GraphicsContext* context) const
     if (horz)
       return;
 
-    // We need to as the WidgetClientWin for the bitmap to use to draw.
-    WidgetClientWin* widget_client = static_cast<WidgetClientWin*>(
+    // We need to as the WidgetClientChromium for the bitmap to use to draw.
+    WidgetClientChromium* widget_client = static_cast<WidgetClientChromium*>(
         WebCore::Widget::client());
     if (!widget_client)
       return;  // Cannot draw without access to the bitmap.
diff --git a/webkit/port/platform/PopupMenuWin.cpp b/webkit/port/platform/chromium/PopupMenuChromium.cpp
index ae0e407c..1071d8c 100644
--- a/webkit/port/platform/PopupMenuWin.cpp
+++ b/webkit/port/platform/chromium/PopupMenuChromium.cpp
@@ -33,7 +33,7 @@
 #include "PopupMenu.h"
 
 #include "CharacterNames.h"
-#include "ChromeClientWin.h"
+#include "ChromeClientChromium.h"
 #include "Document.h"
 #include "Font.h"
 #include "Frame.h"
@@ -51,12 +51,9 @@
 #include "RenderBlock.h"
 #include "RenderTheme.h"
 #include "Widget.h"
-#include "WidgetClientWin.h"
+#include "WidgetClientChromium.h"
 #pragma warning(pop)
 
-//#define LOG_ENABLE
-#include "LogWin.h"
-
 using namespace WTF;
 using namespace Unicode;
 
@@ -358,10 +355,10 @@ void PopupContainer::showPopup(FrameView* view)
     // WidgetClient about it.  It should assign us a client.
     layout();
 
-    WidgetClientWin* widgetClient =
-        static_cast<WidgetClientWin*>(view->client());
-    ChromeClientWin* chromeClient =
-        static_cast<ChromeClientWin*>(view->frame()->page()->chrome()->client());
+    WidgetClientChromium* widgetClient = static_cast<WidgetClientChromium*>(
+        view->client());
+    ChromeClientChromium* chromeClient = static_cast<ChromeClientChromium*>(
+        view->frame()->page()->chrome()->client());
     if (widgetClient && chromeClient) {
         // If the popup would extend past the bottom of the screen, open upwards
         // instead.
@@ -393,7 +390,7 @@ void PopupContainer::hidePopup()
     removeChild(m_listBox.get());
 
     if (client())
-        static_cast<WidgetClientWin*>(client())->popupClosed(this);
+        static_cast<WidgetClientChromium*>(client())->popupClosed(this);
 }
 
 void PopupContainer::layout()
@@ -669,9 +666,6 @@ void PopupListBox::paint(GraphicsContext* gc, const IntRect& rect)
 
     r.move(-tx, -ty);
 
-    LOG(("PopupListBox::paint [%d,%d] [r: %d,%d,%d,%d]", tx, ty,
-        r.x(), r.y(), r.width(), r.height()));
-
     // set clip rect to match revised damage rect
     gc->save();
     gc->translate(static_cast<float>(tx), static_cast<float>(ty));
@@ -726,10 +720,6 @@ void PopupListBox::paintRow(GraphicsContext* gc, const IntRect& rect, int rowInd
     gc->fillRect(rowRect, backColor);
     gc->setFillColor(textColor);
 
-    LOG(("paintRow %d, [%d, %d, %d, %d] %x on %x", rowIndex,
-        rowRect.x(), rowRect.y(), rowRect.width(), rowRect.height(),
-        textColor.rgb(), backColor.rgb()));
-
     Font itemFont = getRowFont(rowIndex);
     gc->setFont(itemFont);
 
diff --git a/webkit/port/platform/SSLKeyGeneratorWin.cpp b/webkit/port/platform/chromium/SSLKeyGeneratorChromium.cpp
index 0b6cb7c..0b6cb7c 100644
--- a/webkit/port/platform/SSLKeyGeneratorWin.cpp
+++ b/webkit/port/platform/chromium/SSLKeyGeneratorChromium.cpp
diff --git a/webkit/port/platform/ScrollViewWin.cpp b/webkit/port/platform/chromium/ScrollViewChromium.cpp
index 2a7ebbc..8ab2822 100644
--- a/webkit/port/platform/ScrollViewWin.cpp
+++ b/webkit/port/platform/chromium/ScrollViewChromium.cpp
@@ -43,7 +43,7 @@
 #include "RenderTheme.h"
 #include "ScrollBar.h"
 #include "SkiaUtils.h"
-#include "WidgetClientWin.h"
+#include "WidgetClientChromium.h"
 #include <algorithm>
 #include <wtf/Assertions.h>
 #include <wtf/HashSet.h>
@@ -184,8 +184,8 @@ void ScrollView::ScrollViewPrivate::valueChanged(Scrollbar* bar)
         frame->sendScrollEvent();
 
         // Inform the delegate that the scroll position has changed.
-        WidgetClientWin* client =
-                static_cast<WidgetClientWin*>(m_view->client());
+        WidgetClientChromium* client =
+                static_cast<WidgetClientChromium*>(m_view->client());
         if (client)
             client->onScrollPositionChanged(m_view);
     }
@@ -273,7 +273,8 @@ const Vector<RefPtr<Range> >* ScrollView::ScrollViewPrivate::getTickmarks() cons
     if (!frame)
         return NULL;  // NOTE: Frame can be null for dropdown boxes.
 
-    WidgetClientWin* c = static_cast<WidgetClientWin*>(m_view->client());
+    WidgetClientChromium* c =
+        static_cast<WidgetClientChromium*>(m_view->client());
     ASSERT(c);
     return c->getTickmarks(view->frame());
 }
@@ -286,9 +287,10 @@ size_t ScrollView::ScrollViewPrivate::getActiveTickmarkIndex() const
 
   // NOTE: Frame can be null for dropdown boxes.
   if (!frame)
-    return WidgetClientWin::kNoTickmark;
+      return WidgetClientChromium::kNoTickmark;
 
-  WidgetClientWin* c = static_cast<WidgetClientWin*>(m_view->client());
+  WidgetClientChromium* c =
+      static_cast<WidgetClientChromium*>(m_view->client());
   ASSERT(c);
   return c->getActiveTickmarkIndex(view->frame());
 }
@@ -296,9 +298,10 @@ size_t ScrollView::ScrollViewPrivate::getActiveTickmarkIndex() const
 const SkBitmap* ScrollView::ScrollViewPrivate::GetPreloadedBitmapFromRenderer(
         int resource_id) const
 {
-    WidgetClientWin* c = static_cast<WidgetClientWin*>(m_view->client());
+    WidgetClientChromium* c =
+        static_cast<WidgetClientChromium*>(m_view->client());
     if (!c)
-      return NULL;
+        return NULL;
 
     return c->getPreloadedResourceBitmap(resource_id);
 }
@@ -904,7 +907,7 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
         m_data->scrollBackingStore(scrollDelta);
 
         // Inform the delegate that the scroll position has changed.
-        WidgetClientWin* c = static_cast<WidgetClientWin*>(client());
+        WidgetClientChromium* c = static_cast<WidgetClientChromium*>(client());
         if (c)
             c->onScrollPositionChanged(this);
     }
@@ -1095,7 +1098,7 @@ void ScrollView::setParent(ScrollView* parentView)
 
 void ScrollView::addToDirtyRegion(const IntRect& containingWindowRect)
 {
-    WidgetClientWin* c = static_cast<WidgetClientWin*>(client());
+    WidgetClientChromium* c = static_cast<WidgetClientChromium*>(client());
     if (c)
         c->invalidateRect(containingWindowRect);
 }
@@ -1110,7 +1113,7 @@ void ScrollView::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRec
         return;
     }
 
-    WidgetClientWin* c = static_cast<WidgetClientWin*>(client());
+    WidgetClientChromium* c = static_cast<WidgetClientChromium*>(client());
     if (c) {
         // TODO(ericroman): would be better to pass both the scroll rect
         // and clip rect up to the client and let them decide how best to
@@ -1128,9 +1131,9 @@ void ScrollView::updateBackingStore()
 
 bool ScrollView::inWindow() const
 {
-    WidgetClientWin* c = static_cast<WidgetClientWin*>(client());
+    WidgetClientChromium* c = static_cast<WidgetClientChromium*>(client());
     if (!c)
-      return false;
+        return false;
 
     return !c->isHidden();
 }
diff --git a/webkit/port/platform/SearchPopupMenuWin.cpp b/webkit/port/platform/chromium/SearchPopupMenuChromium.cpp
index d16ffa6..d16ffa6 100644
--- a/webkit/port/platform/SearchPopupMenuWin.cpp
+++ b/webkit/port/platform/chromium/SearchPopupMenuChromium.cpp
diff --git a/webkit/port/platform/SharedTimerWin.cpp b/webkit/port/platform/chromium/SharedTimerChromium.cpp
index b7f3b08..b7f3b08 100644
--- a/webkit/port/platform/SharedTimerWin.cpp
+++ b/webkit/port/platform/chromium/SharedTimerChromium.cpp
diff --git a/webkit/port/platform/SystemTimeWin.cpp b/webkit/port/platform/chromium/SystemTimeChromium.cpp
index fe3f6d6..fe3f6d6 100644
--- a/webkit/port/platform/SystemTimeWin.cpp
+++ b/webkit/port/platform/chromium/SystemTimeChromium.cpp
diff --git a/webkit/port/platform/TemporaryLinkStubs.cpp b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
index 34fb5f3..34fb5f3 100644
--- a/webkit/port/platform/TemporaryLinkStubs.cpp
+++ b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
diff --git a/webkit/port/platform/TextBoundariesWin.cpp b/webkit/port/platform/chromium/TextBoundariesChromium.cpp
index e633f9b..e633f9b 100644
--- a/webkit/port/platform/TextBoundariesWin.cpp
+++ b/webkit/port/platform/chromium/TextBoundariesChromium.cpp
diff --git a/webkit/port/platform/TextBreakIteratorInternalICUWin.cpp b/webkit/port/platform/chromium/TextBreakIteratorInternalICUChromium.cpp
index 000ae9b..000ae9b 100644
--- a/webkit/port/platform/TextBreakIteratorInternalICUWin.cpp
+++ b/webkit/port/platform/chromium/TextBreakIteratorInternalICUChromium.cpp
diff --git a/webkit/port/platform/WidgetWin.cpp b/webkit/port/platform/chromium/WidgetChromium.cpp
index 2ff7ea65..abd6b02 100644
--- a/webkit/port/platform/WidgetWin.cpp
+++ b/webkit/port/platform/chromium/WidgetChromium.cpp
@@ -33,14 +33,14 @@
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "IntRect.h"
-#include "WidgetClientWin.h"
+#include "WidgetClientChromium.h"
 
 namespace WebCore {
 
 class WidgetPrivate
 {
 public:
-    WidgetClientWin* client;
+    WidgetClientChromium* client;
     ScrollView* parent;
     IntRect frameRect;
     bool enabled;
@@ -77,7 +77,7 @@ HWND Widget::containingWindow() const
 
 void Widget::setClient(WidgetClient* c)
 {
-    data->client = static_cast<WidgetClientWin*>(c);
+    data->client = static_cast<WidgetClientChromium*>(c);
 }
 
 WidgetClient* Widget::client() const
diff --git a/webkit/port/platform/WidgetClientWin.h b/webkit/port/platform/chromium/WidgetClientChromium.h
index 48d1db5..f39c49b 100644
--- a/webkit/port/platform/WidgetClientWin.h
+++ b/webkit/port/platform/chromium/WidgetClientChromium.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WidgetClientWin_H__
-#define WidgetClientWin_H__
+#ifndef WidgetClientChromium_H__
+#define WidgetClientChromium_H__
 
 #include "base/gfx/native_widget_types.h"
 #include "WidgetClient.h"
@@ -17,9 +17,9 @@ class IntRect;
 class Range;
 
 // Generic interface for features needed by the Widget.
-class WidgetClientWin : public WidgetClient {
+class WidgetClientChromium : public WidgetClient {
 public:
-    virtual ~WidgetClientWin() {}
+    virtual ~WidgetClientChromium() {}
 
     // Returns the containing window for the Widget.
     // TODO(pinkerton): this needs a better name, "window" is incorrect on other
@@ -72,4 +72,4 @@ public:
 
 } // namespace WebCore
 
-#endif  // WidgetClientWin_H__
+#endif  // WidgetClientChromium_H__
diff --git a/webkit/port/platform/network/AuthenticationChallenge.h b/webkit/port/platform/network/chromium/AuthenticationChallenge.h
index b1db6cf..b1db6cf 100644
--- a/webkit/port/platform/network/AuthenticationChallenge.h
+++ b/webkit/port/platform/network/chromium/AuthenticationChallenge.h
diff --git a/webkit/port/platform/network/AuthenticationChallenge.cpp b/webkit/port/platform/network/chromium/AuthenticationChallengeChromium.cpp
index f6831cf..fb3c5a4 100644
--- a/webkit/port/platform/network/AuthenticationChallenge.cpp
+++ b/webkit/port/platform/network/chromium/AuthenticationChallengeChromium.cpp
@@ -21,16 +21,16 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */

-

-#include "config.h"

-#include "AuthenticationChallenge.h"

-

-namespace WebCore {

-

-bool AuthenticationChallenge::platformCompare(const AuthenticationChallenge& a, const AuthenticationChallenge& b)

-{

-    return true;

-}

-

-} // namespace WebCore

+ */
+
+#include "config.h"
+#include "AuthenticationChallenge.h"
+
+namespace WebCore {
+
+bool AuthenticationChallenge::platformCompare(const AuthenticationChallenge& a, const AuthenticationChallenge& b)
+{
+    return true;
+}
+
+} // namespace WebCore
diff --git a/webkit/port/platform/network/CookieJarWin.cpp b/webkit/port/platform/network/chromium/CookieJarChromium.cpp
index 9d2ec62..9d2ec62 100644
--- a/webkit/port/platform/network/CookieJarWin.cpp
+++ b/webkit/port/platform/network/chromium/CookieJarChromium.cpp
diff --git a/webkit/port/platform/network/DNS.cpp b/webkit/port/platform/network/chromium/DNSChromium.cpp
index 2044742..2044742 100644
--- a/webkit/port/platform/network/DNS.cpp
+++ b/webkit/port/platform/network/chromium/DNSChromium.cpp
diff --git a/webkit/port/platform/network/NetworkStateNotifierWin.cpp b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp
index 72104bb..8d0d877 100644
--- a/webkit/port/platform/network/NetworkStateNotifierWin.cpp
+++ b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp
@@ -36,6 +36,8 @@ void NetworkStateNotifier::updateState()
 {

 }

 

+// TODO(darin): Kill this once we stop defining PLATFORM(WIN)

+#if PLATFORM(WIN)

 void NetworkStateNotifier::addressChanged()

 {

 }

@@ -51,6 +53,7 @@ void CALLBACK NetworkStateNotifier::addrChangeCallback(void* context, BOOLEAN ti
 void NetworkStateNotifier::registerForAddressChange()

 {

 }

+#endif

 

 NetworkStateNotifier::NetworkStateNotifier()

     : m_isOnLine(true)

diff --git a/webkit/port/platform/network/ResourceError.h b/webkit/port/platform/network/chromium/ResourceError.h
index a71b302..a71b302 100644
--- a/webkit/port/platform/network/ResourceError.h
+++ b/webkit/port/platform/network/chromium/ResourceError.h
diff --git a/webkit/port/platform/network/ResourceRequest.h b/webkit/port/platform/network/chromium/ResourceRequest.h
index b6119db..b6119db 100644
--- a/webkit/port/platform/network/ResourceRequest.h
+++ b/webkit/port/platform/network/chromium/ResourceRequest.h
diff --git a/webkit/port/platform/network/ResourceResponse.h b/webkit/port/platform/network/chromium/ResourceResponse.h
index cf498bd..cf498bd 100644
--- a/webkit/port/platform/network/ResourceResponse.h
+++ b/webkit/port/platform/network/chromium/ResourceResponse.h
diff --git a/webkit/port/platform/BString.cpp b/webkit/port/platform/win/BString.cpp
index c049b1b..c049b1b 100644
--- a/webkit/port/platform/BString.cpp
+++ b/webkit/port/platform/win/BString.cpp
diff --git a/webkit/port/platform/BString.h b/webkit/port/platform/win/BString.h
index 803a9b0..803a9b0 100644
--- a/webkit/port/platform/BString.h
+++ b/webkit/port/platform/win/BString.h
diff --git a/webkit/port/platform/COMPtr.h b/webkit/port/platform/win/COMPtr.h
index c06b3d2..c06b3d2 100644
--- a/webkit/port/platform/COMPtr.h
+++ b/webkit/port/platform/win/COMPtr.h
diff --git a/webkit/port/platform/ClipboardUtilitiesWin.cpp b/webkit/port/platform/win/ClipboardUtilitiesWin.cpp
index f23c2fe..f23c2fe 100644
--- a/webkit/port/platform/ClipboardUtilitiesWin.cpp
+++ b/webkit/port/platform/win/ClipboardUtilitiesWin.cpp
diff --git a/webkit/port/platform/ClipboardUtilitiesWin.h b/webkit/port/platform/win/ClipboardUtilitiesWin.h
index bc8fb0a..bc8fb0a 100644
--- a/webkit/port/platform/ClipboardUtilitiesWin.h
+++ b/webkit/port/platform/win/ClipboardUtilitiesWin.h
diff --git a/webkit/port/platform/ClipboardWin.cpp b/webkit/port/platform/win/ClipboardWin.cpp
index 0383610..0383610 100644
--- a/webkit/port/platform/ClipboardWin.cpp
+++ b/webkit/port/platform/win/ClipboardWin.cpp
diff --git a/webkit/port/platform/ClipboardWin.h b/webkit/port/platform/win/ClipboardWin.h
index a52c242..a52c242 100644
--- a/webkit/port/platform/ClipboardWin.h
+++ b/webkit/port/platform/win/ClipboardWin.h
diff --git a/webkit/port/platform/EditorWin.cpp b/webkit/port/platform/win/EditorWin.cpp
index 8ffcf9a..8ffcf9a 100644
--- a/webkit/port/platform/EditorWin.cpp
+++ b/webkit/port/platform/win/EditorWin.cpp
diff --git a/webkit/port/platform/KeyEventWin.cpp b/webkit/port/platform/win/KeyEventWin.cpp
index 5650747..5650747 100644
--- a/webkit/port/platform/KeyEventWin.cpp
+++ b/webkit/port/platform/win/KeyEventWin.cpp
diff --git a/webkit/port/platform/PasteboardWin.cpp b/webkit/port/platform/win/PasteboardWin.cpp
index f22b85f..f22b85f 100644
--- a/webkit/port/platform/PasteboardWin.cpp
+++ b/webkit/port/platform/win/PasteboardWin.cpp
diff --git a/webkit/port/platform/PlatformMouseEventWin.cpp b/webkit/port/platform/win/PlatformMouseEventWin.cpp
index 33c5692..33c5692 100644
--- a/webkit/port/platform/PlatformMouseEventWin.cpp
+++ b/webkit/port/platform/win/PlatformMouseEventWin.cpp
diff --git a/webkit/port/platform/win/README b/webkit/port/platform/win/README
new file mode 100644
index 0000000..7fe1b47
--- /dev/null
+++ b/webkit/port/platform/win/README
@@ -0,0 +1,2 @@
+This directory is temporary and must go away.  It contains forks of some files
+from WebCore/platform/win/.
diff --git a/webkit/port/platform/ScreenWin.cpp b/webkit/port/platform/win/ScreenWin.cpp
index 83f97cd..83f97cd 100644
--- a/webkit/port/platform/ScreenWin.cpp
+++ b/webkit/port/platform/win/ScreenWin.cpp
diff --git a/webkit/port/platform/SoundWin.cpp b/webkit/port/platform/win/SoundWin.cpp
index 443e7d9..443e7d9 100644
--- a/webkit/port/platform/SoundWin.cpp
+++ b/webkit/port/platform/win/SoundWin.cpp
diff --git a/webkit/port/platform/WCDataObject.cpp b/webkit/port/platform/win/WCDataObject.cpp
index 57e062a..57e062a 100644
--- a/webkit/port/platform/WCDataObject.cpp
+++ b/webkit/port/platform/win/WCDataObject.cpp
diff --git a/webkit/port/platform/WCDataObject.h b/webkit/port/platform/win/WCDataObject.h
index 51e37a0..51e37a0 100644
--- a/webkit/port/platform/WCDataObject.h
+++ b/webkit/port/platform/win/WCDataObject.h
diff --git a/webkit/port/platform/WheelEventWin.cpp b/webkit/port/platform/win/WheelEventWin.cpp
index 22c2dce..22c2dce 100644
--- a/webkit/port/platform/WheelEventWin.cpp
+++ b/webkit/port/platform/win/WheelEventWin.cpp
diff --git a/webkit/port/plugins/PluginDataChromium.cpp b/webkit/port/plugins/chromium/PluginDataChromium.cpp
index c289464..c289464 100644
--- a/webkit/port/plugins/PluginDataChromium.cpp
+++ b/webkit/port/plugins/chromium/PluginDataChromium.cpp