Revert of Migrate accessibility from RenderView to RenderFrame.

content/browser/accessibility/browser_accessibility_state_impl.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_state_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/timer.h"
 #include "content/browser/accessibility/accessibility_mode_helper.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gfx/sys_color_change_listener.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace content {
 
 // Update the accessibility histogram 45 seconds after initialization.
@@ skipping 67 matching lines @@
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceRendererAccessibility)) {
     accessibility_mode_ = AccessibilityModeComplete;
   }
 }
 
 void BrowserAccessibilityStateImpl::ResetAccessibilityMode() {
   ResetAccessibilityModeValue();
 
-  std::vector<WebContentsImpl*> web_contents_vector =
-      WebContentsImpl::GetAllWebContents();
-  for (size_t i = 0; i < web_contents_vector.size(); ++i)
-    web_contents_vector[i]->SetAccessibilityMode(accessibility_mode());
+  // Iterate over all RenderWidgetHosts, even swapped out ones in case
+  // they become active again.
+  scoped_ptr<RenderWidgetHostIterator> widgets(
+      RenderWidgetHostImpl::GetAllRenderWidgetHosts());
+  while (RenderWidgetHost* widget = widgets->GetNextHost()) {
+    // Ignore processes that don't have a connection, such as crashed tabs.
+    if (!widget->GetProcess()->HasConnection())
+      continue;
+    if (!widget->IsRenderView())
+      continue;
+
+    RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
+    rwhi->ResetAccessibilityMode();
+  }
 }
 
 bool BrowserAccessibilityStateImpl::IsAccessibleBrowser() {
   return ((accessibility_mode_ & AccessibilityModeComplete) ==
           AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::AddHistogramCallback(
     base::Closure callback) {
   histogram_callbacks_.push_back(callback);
@@ skipping 25 matching lines @@
 void BrowserAccessibilityStateImpl::AddAccessibilityMode(
     AccessibilityMode mode) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRendererAccessibility)) {
     return;
   }
 
   accessibility_mode_ =
       content::AddAccessibilityModeTo(accessibility_mode_, mode);
 
-  AddOrRemoveFromAllWebContents(mode, true);
+  AddOrRemoveFromRenderWidgets(mode, true);
 }
 
 void BrowserAccessibilityStateImpl::RemoveAccessibilityMode(
     AccessibilityMode mode) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceRendererAccessibility) &&
       mode == AccessibilityModeComplete) {
     return;
   }
 
   accessibility_mode_ =
       content::RemoveAccessibilityModeFrom(accessibility_mode_, mode);
 
-  AddOrRemoveFromAllWebContents(mode, false);
+  AddOrRemoveFromRenderWidgets(mode, false);
 }
 
-void BrowserAccessibilityStateImpl::AddOrRemoveFromAllWebContents(
+void BrowserAccessibilityStateImpl::AddOrRemoveFromRenderWidgets(
     AccessibilityMode mode,
     bool add) {
-  std::vector<WebContentsImpl*> web_contents_vector =
-      WebContentsImpl::GetAllWebContents();
-  for (size_t i = 0; i < web_contents_vector.size(); ++i) {
+  // Iterate over all RenderWidgetHosts, even swapped out ones in case
+  // they become active again.
+  scoped_ptr<RenderWidgetHostIterator> widgets(
+      RenderWidgetHostImpl::GetAllRenderWidgetHosts());
+  while (RenderWidgetHost* widget = widgets->GetNextHost()) {
+    // Ignore processes that don't have a connection, such as crashed tabs.
+    if (!widget->GetProcess()->HasConnection())
+      continue;
+    if (!widget->IsRenderView())
+      continue;
+
+    RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
     if (add)
-      web_contents_vector[i]->AddAccessibilityMode(mode);
+      rwhi->AddAccessibilityMode(mode);
     else
-      web_contents_vector[i]->RemoveAccessibilityMode(mode);
+      rwhi->RemoveAccessibilityMode(mode);
   }
 }
 
 }  // namespace content