Scope and clean up uses of AccessibilityMode.

content/renderer/accessibility/render_accessibility_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/renderer/accessibility/render_accessibility_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
@@ skipping 51 matching lines @@
   DCHECK(render_frame);
   DCHECK(response);
   if (!render_frame->GetWebFrame())
     return;
 
   WebDocument document = render_frame->GetWebFrame()->document();
   WebScopedAXContext context(document);
   WebAXObject root = context.root();
   if (!root.updateLayoutAndCheckValidity())
     return;
-  BlinkAXTreeSource tree_source(render_frame, ACCESSIBILITY_MODE_COMPLETE);
+  BlinkAXTreeSource tree_source(
+      render_frame,
+      AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents |
+          AccessibilityMode::kInlineTextBoxes |
+          AccessibilityMode::kScreenReader | AccessibilityMode::kHTML);
   tree_source.SetRoot(root);
   ScopedFreezeBlinkAXTreeSource freeze(&tree_source);
   BlinkAXTreeSerializer serializer(&tree_source);
   serializer.set_max_node_count(kMaxSnapshotNodeCount);
   serializer.SerializeChanges(context.root(), response);
 }
 
 RenderAccessibilityImpl::RenderAccessibilityImpl(RenderFrameImpl* render_frame,
                                                  AccessibilityMode mode)
     : RenderFrameObserver(render_frame),
@@ skipping 12 matching lines @@
   settings->setAccessibilityEnabled(true);
 
 #if defined(OS_ANDROID)
   // Password values are only passed through on Android.
   settings->setAccessibilityPasswordValuesEnabled(true);
 #endif
 
 #if !defined(OS_ANDROID)
   // Inline text boxes can be enabled globally on all except Android.
   // On Android they can be requested for just a specific node.
-  if (mode & ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES)
+  if (mode.has_mode(AccessibilityMode::kInlineTextBoxes))
     settings->setInlineTextBoxAccessibilityEnabled(true);
 #endif
 
   const WebDocument& document = GetMainDocument();
   if (!document.isNull()) {
     // It's possible that the webview has already loaded a webpage without
     // accessibility being enabled. Initialize the browser's cached
     // accessibility tree by sending it a notification.
     HandleAXEvent(document.accessibilityObject(), ui::AX_EVENT_LAYOUT_COMPLETE);
   }
@@ skipping 546 matching lines @@
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   document.accessibilityObject().scrollToMakeVisibleWithSubFocus(
       WebRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()));
 }
 
 }  // namespace content