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

chrome/common/render_messages.h

 // 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.
 
 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 
 #include <string>
 #include <vector>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #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"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/transport_dib.h"
 #include "googleurl/src/gurl.h"
 #include "media/audio/audio_output.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 #include "webkit/glue/autofill_form.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/feed.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/password_form.h"
 #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"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview_delegate.h"
 
 #if defined(OS_POSIX)
 #include "skia/include/SkBitmap.h"
 #endif
 
@@ skipping 540 matching lines @@
       LogParam(iter->type, log);
       log->append(L", ");
       LogParam(iter->url, log);
       log->append(L"]");
     }
     log->append(L"})");
   }
 };
 
 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", ");
     LogParam(p.input_long2, l);
     l->append(L")");
   }
 };
 
 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);
     WriteParam(m, p.output_long4);
     WriteParam(m, p.output_string);
     WriteParam(m, p.return_code);
   }
   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) &&
       ReadParam(m, iter, &p->output_long4) &&
       ReadParam(m, iter, &p->output_string) &&
       ReadParam(m, iter, &p->return_code);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
-    LogParam(p.iaccessible_id, l);
-    l->append(L", ");
-    LogParam(p.output_variant_lval, l);
+    LogParam(p.object_id, l);
     l->append(L", ");
     LogParam(p.output_long1, l);
     l->append(L", ");
     LogParam(p.output_long2, l);
     l->append(L", ");
     LogParam(p.output_long3, l);
     l->append(L", ");
     LogParam(p.output_long4, l);
     l->append(L", ");
     LogParam(p.output_string, l);
@@ skipping 1218 matching lines @@
   }
 };
 
 }  // namespace IPC
 
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "chrome/common/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_