Use renderer spellchecker for windows.

BUG=25677
Review URL: http://codereview.chromium.org/372075

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

3 files changed, 7 insertions, 17 deletions

diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index f9597e3..3a98af6 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -551,7 +551,6 @@ class NotificationType {
     // profile.
     SPELLCHECKER_REINITIALIZED,
 
-#if defined(SPELLCHECKER_IN_RENDERER)
     // Sent when SpellCheckHost has been reloaded. The source is the profile,
     // the details are NoDetails.
     SPELLCHECK_HOST_REINITIALIZED,
@@ -559,7 +558,6 @@ class NotificationType {
     // Sent when a new word has been added to the custom dictionary. The source
     // is the SpellCheckHost, the details are NoDetails.
     SPELLCHECK_WORD_ADDED,
-#endif
 
     // Sent when the bookmark bubble is shown for a particular URL. The source
     // is the profile, the details the URL.
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index c2410ce..3403448 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -12,6 +12,7 @@
 #include "app/clipboard/clipboard.h"
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
+#include "base/platform_file.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/string16.h"
@@ -31,6 +32,7 @@
 #include "chrome/common/webkit_param_traits.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_utils.h"
+#include "ipc/ipc_platform_file.h"
 #include "media/audio/audio_output.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
@@ -50,12 +52,7 @@
 #include "webkit/glue/webplugininfo.h"
 #include "webkit/glue/webpreferences.h"
 
-#if defined(OS_WIN)
-#include "base/platform_file.h"
-#endif
-
 #if defined(OS_POSIX)
-#include "base/file_descriptor_posix.h"
 #endif
 
 namespace base {
@@ -410,10 +407,8 @@ struct ViewMsg_PrintPages_Params {
 };
 
 struct ViewMsg_DatabaseOpenFileResponse_Params {
-#if defined(OS_WIN)
-  base::PlatformFile file_handle;     // DB file handle
-#elif defined(OS_POSIX)
-  base::FileDescriptor file_handle;   // DB file handle
+  IPC::PlatformFileForTransit file_handle;     // DB file handle
+#if defined(OS_POSIX)
   base::FileDescriptor dir_handle;    // DB directory handle
 #endif
 };
@@ -421,11 +416,7 @@ struct ViewMsg_DatabaseOpenFileResponse_Params {
 struct ViewMsg_OpenFileForPluginResponse_Params {
   // Note: if we end up having to add a directory handle, this should be
   // combined with the DatabaseOpenFileResponse_Params struct.
-#if defined(OS_WIN)
-  base::PlatformFile file_handle;
-#elif defined(OS_POSIX)
-  base::FileDescriptor file_handle;
-#endif
+  IPC::PlatformFileForTransit file_handle;
 };
 
 // Parameters to describe a rendered page.
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index a5c5f35..3d99dbe 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -29,6 +29,7 @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_platform_file.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/glue/dom_operations.h"
@@ -839,7 +840,7 @@ IPC_BEGIN_MESSAGES(View)
   // be called directly after startup or in (async) response to a
   // RequestDictionary ViewHost message.
   IPC_MESSAGE_CONTROL4(ViewMsg_SpellChecker_Init,
-                       base::FileDescriptor /* bdict_file */,
+                       IPC::PlatformFileForTransit /* bdict_file */,
                        std::vector<std::string> /* custom_dict_words */,
                        std::string /* language */,
                        bool /* auto spell correct */)