hodgepodge for test_shell.cc

webkit/tools/test_shell/webview_host.h

Index: webkit/tools/test_shell/webview_host.h
diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h
index 146f6ab5f82a31dc9d1bdbdff6fd02c2db767d6a..d596966bbe9ebf3beae39232f0afddb4a14e0885 100644
--- a/webkit/tools/test_shell/webview_host.h
+++ b/webkit/tools/test_shell/webview_host.h
@@ -5,7 +5,9 @@
 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H__
 #define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H__
 
+#if defined(OS_WIN)
 #include <windows.h>
+#endif
 
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
@@ -21,17 +23,24 @@ class WebViewHost : public WebWidgetHost {
   // The new instance is deleted once the associated HWND is destroyed.  The
   // newly created window should be resized after it is created, using the
   // MoveWindow (or equivalent) function.
+#if defined(OS_WIN)
   static WebViewHost* Create(HWND parent_window,
                              WebViewDelegate* delegate,
                              const WebPreferences& prefs);
+#else  // null port.
+  static WebViewHost* Create(void* parent_window,
+                             WebViewDelegate* delegate,
+                             const WebPreferences& prefs);
+#endif
 
   WebView* webview() const;
 
  protected:
+#if defined(OS_WIN)
   virtual bool WndProc(UINT message, WPARAM wparam, LPARAM lparam) {
     return false;
   }
+#endif
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H__
-