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

chrome/renderer/render_view.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_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "chrome/renderer/extensions/extension_bindings.h"
 #include "chrome/renderer/external_js_object.h"
 #include "chrome/renderer/render_widget.h"
 #include "media/audio/audio_output.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/glue/console_message_level.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/feed.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/password_form_dom_manager.h"
+#include "webkit/glue/webaccessibilitymanager.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
 // RenderView is a diamond-shaped hierarchy, with WebWidgetDelegate at the root.
 // VS warns when we inherit the WebWidgetDelegate method implementations from
 // RenderWidget.  It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 
 class AudioRendererImpl;
 class DictionaryValue;
 class DebugMessageHandler;
 class DevToolsAgent;
 class DevToolsClient;
 class FilePath;
-class GlueAccessibility;
 class GURL;
 class RenderThread;
 class ResourceDispatcher;
 class SkBitmap;
+class WebAccessibilityManager;
 class WebError;
 class WebFrame;
 class WebPluginDelegate;
 class WebPluginDelegateProxy;
 class WebDevToolsAgentDelegate;
-struct AccessibilityInParams;
-struct AccessibilityOutParams;
 struct FindInPageRequest;
 struct ThumbnailScore;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_PrintPage_Params;
 struct ViewMsg_PrintPages_Params;
 struct ViewMsg_Print_Params;
 struct ViewMsg_UploadFile_Params;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace webkit_glue {
 struct FileUploadData;
+//class WebAccessibility;
+//struct InParams;
+//struct OutParams;
 }
 
 // We need to prevent a page from trying to create infinite popups. It is not
 // as simple as keeping a count of the number of immediate children
 // popups. Having an html file that window.open()s itself would create
 // an unlimited chain of RenderViews who only have one RenderView child.
 //
 // Therefore, each new top level RenderView creates a new counter and shares it
 // with all its children and grandchildren popup RenderViews created with
 // CreateWebView() to have a sort of global limit for the page so no more than
@@ skipping 423 matching lines @@
   void OnReservePageIDRange(int size_of_range);
 
   void OnDragSourceEndedOrMoved(
       int client_x, int client_y, int screen_x, int screen_y, bool ended);
   void OnDragSourceSystemDragEnded();
   void OnInstallMissingPlugin();
   void OnFileChooserResponse(const std::vector<std::wstring>& file_names);
   void OnEnableViewSourceMode();
   void OnUpdateBackForwardListCount(int back_list_count,
                                     int forward_list_count);
-  void OnGetAccessibilityInfo(const AccessibilityInParams& in_params,
-                              AccessibilityOutParams* out_params);
-  void OnClearAccessibilityInfo(int iaccessible_id, bool clear_all);
+  void OnGetAccessibilityInfo(
+      const webkit_glue::WebAccessibility::InParams& in_params,
+      webkit_glue::WebAccessibility::OutParams* out_params);
+  void OnClearAccessibilityInfo(int acc_obj_id, bool clear_all);
 
   void OnMoveOrResizeStarted();
 
   // Checks if the RenderView should close, runs the beforeunload handler and
   // sends ViewMsg_ShouldClose to the browser.
   void OnMsgShouldClose();
 
   // Runs the onunload handler and closes the page, replying with ClosePage_ACK
   // (with the given RPH and request IDs, to help track the request).
   void OnClosePage(int new_render_process_host_id, int new_request_id);
@@ skipping 216 matching lines @@
   // The total number of unrequested popups that exist and can be followed back
   // to a common opener. This count is shared among all RenderViews created
   // with CreateWebView(). All popups are treated as unrequested until
   // specifically instructed otherwise by the Browser process.
   scoped_refptr<SharedRenderViewCounter> shared_popup_counter_;
 
   // Whether this is a top level window (instead of a popup). Top level windows
   // shouldn't count against their own |shared_popup_counter_|.
   bool decrement_shared_popup_at_destruction_;
 
-  // TODO(port): revisit once qwe have accessibility
+  // TODO(port): revisit once we have accessibility
 #if defined(OS_WIN)
   // Handles accessibility requests into the renderer side, as well as
   // maintains the cache and other features of the accessibility tree.
-  scoped_ptr<GlueAccessibility> glue_accessibility_;
+  scoped_ptr<webkit_glue::WebAccessibilityManager> web_accessibility_manager_;
 #endif
 
   // Resource message queue. Used to queue up resource IPCs if we need
   // to wait for an ACK from the browser before proceeding.
   std::queue<IPC::Message*> queued_resource_messages_;
 
   // The id of the last request sent for form field autofill.  Used to ignore
   // out of date responses.
   int form_field_autofill_request_id_;
 
@@ skipping 17 matching lines @@
   // change but is overridden by tests.
   int delay_seconds_for_form_state_sync_;
 
   // A set of audio renderers registered to use IPC for audio output.
   IDMap<AudioRendererImpl> audio_renderers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_