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

chrome/renderer/render_view.cc

 // 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.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 29 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "printing/units.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
-#include "webkit/glue/glue_accessibility.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/searchable_form_data.h"
+#include "webkit/glue/webaccessibilitymanager_impl.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webdevtoolsagent_delegate.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/weberror.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webhistoryitem.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webplugin_delegate.h"
@@ skipping 17 matching lines @@
 
 #if defined(OS_WIN)
 // If true, the URL of the active renderer is logged. Logging is done in such
 // way that if the renderer crashes the URL of the active renderer is contained
 // in the dump. Currently mini-dumps are only supported on windows, so this is
 // only enabled on windows.
 #define LOG_RENDERER_URL
 #endif
 
 using base::TimeDelta;
+using webkit_glue::WebAccessibility;
 
 //-----------------------------------------------------------------------------
 
 // define to write the time necessary for thumbnail/DOM text retrieval,
 // respectively, into the system debug log
 // #define TIME_BITMAP_RETRIEVAL
 // #define TIME_TEXT_RETRIEVAL
 
 // maximum number of characters in the document to index, any text beyond this
 // point will be clipped
@@ skipping 978 matching lines @@
 
   last_page_id_sent_to_browser_ =
       std::max(last_page_id_sent_to_browser_, page_id_);
 
   // If we end up reusing this WebRequest (for example, due to a #ref click),
   // we don't want the transition type to persist.
   if (extra_data)
     extra_data->transition_type = PageTransition::LINK;  // Just clear it.
 
 #if defined(OS_WIN)
-  if (glue_accessibility_.get()) {
+  if (web_accessibility_manager_.get()) {
     // Clear accessibility info cache.
-    glue_accessibility_->ClearIAccessibleMap(-1, true);
+    web_accessibility_manager_->ClearAccObjMap(-1, true);
   }
 #else
   // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
 #endif
 }
 
 // Tell the embedding application that the title of the active page has changed
 void RenderView::UpdateTitle(WebFrame* frame, const std::wstring& title) {
   // Ignore all but top level navigations...
   if (webview()->GetMainFrame() == frame)
@@ skipping 1520 matching lines @@
   main_frame->SetInViewSourceMode(true);
 }
 
 void RenderView::OnUpdateBackForwardListCount(int back_list_count,
                                               int forward_list_count) {
   history_back_list_count_ = back_list_count;
   history_forward_list_count_ = forward_list_count;
 }
 
 void RenderView::OnGetAccessibilityInfo(
-    const AccessibilityInParams& in_params,
-    AccessibilityOutParams* out_params) {
+    const webkit_glue::WebAccessibility::InParams& in_params,
+    webkit_glue::WebAccessibility::OutParams* out_params) {
 #if defined(OS_WIN)
-  if (!glue_accessibility_.get())
-    glue_accessibility_.reset(new GlueAccessibility());
+  if (!web_accessibility_manager_.get()) {
+    web_accessibility_manager_.reset(
+        webkit_glue::WebAccessibilityManager::Create());
+  }
 
-  if (!glue_accessibility_->
-       GetAccessibilityInfo(webview(), in_params, out_params)) {
+  if (!web_accessibility_manager_->GetAccObjInfo(webview(), in_params,
+                                                 out_params)) {
     return;
   }
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
-void RenderView::OnClearAccessibilityInfo(int iaccessible_id, bool clear_all) {
+void RenderView::OnClearAccessibilityInfo(int acc_obj_id, bool clear_all) {
 #if defined(OS_WIN)
-  if (!glue_accessibility_.get()) {
+  if (!web_accessibility_manager_.get()) {
     // If accessibility is not activated, ignore clearing message.
     return;
   }
-
-  if (!glue_accessibility_->ClearIAccessibleMap(iaccessible_id, clear_all))
+  if (!web_accessibility_manager_->ClearAccObjMap(acc_obj_id, clear_all))
     return;
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
 void RenderView::OnGetAllSavableResourceLinksForCurrentPage(
     const GURL& page_url) {
   // Prepare list to storage all savable resource links.
@@ skipping 254 matching lines @@
   DCHECK(audio_renderers_.Lookup(stream_id) != NULL);
   Send(new ViewHostMsg_SetAudioVolume(routing_id_, stream_id, left, right));
 }
 
 void RenderView::OnResize(const gfx::Size& new_size,
                           const gfx::Rect& resizer_rect) {
   if (webview())
     webview()->HideAutofillPopup();
   RenderWidget::OnResize(new_size, resizer_rect);
 }