Removes all use of COM and dependencies on Windows-specific classes (includin...

chrome/common/render_messages.h

Index: chrome/common/render_messages.h
===================================================================
--- chrome/common/render_messages.h	(revision 12107)
+++ chrome/common/render_messages.h	(working copy)
@@ -14,7 +14,6 @@
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "chrome/browser/renderer_host/resource_handler.h"
-#include "chrome/common/accessibility.h"
 #include "chrome/common/filter_policy.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "chrome/common/modal_dialog_event.h"
@@ -34,6 +33,7 @@
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/screen_info.h"
+#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webplugin.h"
@@ -594,30 +594,30 @@
 };
 
 template <>
-struct ParamTraits<AccessibilityInParams> {
-  typedef AccessibilityInParams param_type;
+struct ParamTraits<webkit_glue::WebAccessibility::InParams> {
+  typedef webkit_glue::WebAccessibility::InParams param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.iaccessible_id);
-    WriteParam(m, p.iaccessible_function_id);
-    WriteParam(m, p.input_variant_lval);
+    WriteParam(m, p.object_id);
+    WriteParam(m, p.function_id);
+    WriteParam(m, p.child_id);
     WriteParam(m, p.input_long1);
     WriteParam(m, p.input_long2);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
-      ReadParam(m, iter, &p->iaccessible_id) &&
-      ReadParam(m, iter, &p->iaccessible_function_id) &&
-      ReadParam(m, iter, &p->input_variant_lval) &&
+      ReadParam(m, iter, &p->object_id) &&
+      ReadParam(m, iter, &p->function_id) &&
+      ReadParam(m, iter, &p->child_id) &&
       ReadParam(m, iter, &p->input_long1) &&
       ReadParam(m, iter, &p->input_long2);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
-    LogParam(p.iaccessible_id, l);
+    LogParam(p.object_id, l);
     l->append(L", ");
-    LogParam(p.iaccessible_function_id, l);
+    LogParam(p.function_id, l);
     l->append(L", ");
-    LogParam(p.input_variant_lval, l);
+    LogParam(p.child_id, l);
     l->append(L", ");
     LogParam(p.input_long1, l);
     l->append(L", ");
@@ -627,11 +627,10 @@
 };
 
 template <>
-struct ParamTraits<AccessibilityOutParams> {
-  typedef AccessibilityOutParams param_type;
+struct ParamTraits<webkit_glue::WebAccessibility::OutParams> {
+  typedef webkit_glue::WebAccessibility::OutParams param_type;
   static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.iaccessible_id);
-    WriteParam(m, p.output_variant_lval);
+    WriteParam(m, p.object_id);
     WriteParam(m, p.output_long1);
     WriteParam(m, p.output_long2);
     WriteParam(m, p.output_long3);
@@ -641,8 +640,7 @@
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
-      ReadParam(m, iter, &p->iaccessible_id) &&
-      ReadParam(m, iter, &p->output_variant_lval) &&
+      ReadParam(m, iter, &p->object_id) &&
       ReadParam(m, iter, &p->output_long1) &&
       ReadParam(m, iter, &p->output_long2) &&
       ReadParam(m, iter, &p->output_long3) &&
@@ -652,10 +650,8 @@
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
-    LogParam(p.iaccessible_id, l);
+    LogParam(p.object_id, l);
     l->append(L", ");
-    LogParam(p.output_variant_lval, l);
-    l->append(L", ");
     LogParam(p.output_long1, l);
     l->append(L", ");
     LogParam(p.output_long2, l);