Scope and clean up uses of AccessibilityMode.

content/renderer/accessibility/blink_ax_tree_source.cc

 // Copyright 2014 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/blink_ax_tree_source.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 415 matching lines @@
 
   if (src.canSetValueAttribute())
     dst->AddBoolAttribute(ui::AX_ATTR_CAN_SET_VALUE, true);
 
   if (!src.url().isEmpty())
     dst->AddStringAttribute(ui::AX_ATTR_URL, src.url().string().utf8());
 
   // The following set of attributes are only accessed when the accessibility
   // mode is set to screen reader mode, otherwise only the more basic
   // attributes are populated.
-  if (accessibility_mode_ & ACCESSIBILITY_MODE_FLAG_SCREEN_READER) {
+  if (accessibility_mode_.has_mode(AccessibilityMode::kScreenReader)) {
     blink::WebString web_placeholder = src.placeholder(nameFrom);
     if (!web_placeholder.isEmpty())
       dst->AddStringAttribute(ui::AX_ATTR_PLACEHOLDER, web_placeholder.utf8());
 
     if (dst->role == ui::AX_ROLE_COLOR_WELL)
       dst->AddIntAttribute(ui::AX_ATTR_COLOR_VALUE, src.colorValue());
 
     // Text attributes.
     if (src.backgroundColor())
       dst->AddIntAttribute(ui::AX_ATTR_BACKGROUND_COLOR, src.backgroundColor());
@@ skipping 296 matching lines @@
   // The majority of the rest of this code computes attributes needed for
   // all modes, not just for screen readers.
 
   WebNode node = src.node();
   bool is_iframe = false;
 
   if (!node.isNull() && node.isElementNode()) {
     WebElement element = node.to<WebElement>();
     is_iframe = element.hasHTMLTagName("iframe");
 
-    if (accessibility_mode_ & ACCESSIBILITY_MODE_FLAG_HTML) {
+    if (accessibility_mode_.has_mode(AccessibilityMode::kHTML)) {
       // TODO(ctguil): The tagName in WebKit is lower cased but
       // HTMLElement::nodeName calls localNameUpper. Consider adding
       // a WebElement method that returns the original lower cased tagName.
       dst->AddStringAttribute(
           ui::AX_ATTR_HTML_TAG,
           base::ToLowerASCII(element.tagName().utf8()));
       for (unsigned i = 0; i < element.attributeCount(); ++i) {
         std::string name = base::ToLowerASCII(
             element.attributeLocalName(i).utf8());
         std::string value = element.attributeValue(i).utf8();
@@ skipping 97 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->document();
   if (!document.isNull())
     return document.accessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content