Minor cleanup in WebKitClient.

1. Avoid including windows.h
2. Rename FileType to FileHandle
3. Fix consumers to use FileHandle 

R=dglazkov
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/246072

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

1 files changed, 8 insertions, 6 deletions

diff --git a/webkit/api/public/WebKitClient.h b/webkit/api/public/WebKitClient.h
index b95dc1f..32bd4c70 100644
--- a/webkit/api/public/WebKitClient.h
+++ b/webkit/api/public/WebKitClient.h
@@ -37,8 +37,8 @@
 #include "WebLocalizedString.h"
 #include "webkit/api/src/TemporaryGlue.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
+#ifdef WIN32
+typedef void *HANDLE;
 #endif
 
 namespace WebKit {
@@ -120,17 +120,19 @@ namespace WebKit {
         // hash must have been generated by calling VisitedLinkHash().
         virtual bool isLinkVisited(unsigned long long linkHash) = 0;
 
+
         // HTML5 DB ------------------------------------------------------------
 
-#if defined(OS_WIN)
-        typedef HANDLE FileType;
+#ifdef WIN32
+        typedef HANDLE FileHandle;
 #else
-        typedef int FileType;
+        typedef int FileHandle;
 #endif
 
         // Opens a database file; dirHandle should be NULL if the caller does not need
         // a handle to the directory containing this file
-        virtual FileType databaseOpenFile(const WebString& fileName, int desiredFlags, FileType* dirHandle) = 0;
+        virtual FileHandle databaseOpenFile(
+            const WebString& fileName, int desiredFlags, FileHandle* dirHandle) = 0;
 
         // Deletes a database file and returns the error code
         virtual int databaseDeleteFile(const WebString& fileName, bool syncDir) = 0;