Scope and clean up uses of AccessibilityMode.

content/browser/accessibility/accessibility_ui.cc

Index: content/browser/accessibility/accessibility_ui.cc
diff --git a/content/browser/accessibility/accessibility_ui.cc b/content/browser/accessibility/accessibility_ui.cc
index 7c8062688b61e734408ea229e018e44a95749d50..c730ea008b59ea25de66611b9433be389c2e16ca 100644
--- a/content/browser/accessibility/accessibility_ui.cc
+++ b/content/browser/accessibility/accessibility_ui.cc
@@ -89,7 +89,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
     RenderViewHost* rvh) {
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       WebContents::FromRenderViewHost(rvh));
-  AccessibilityMode accessibility_mode = AccessibilityModeOff;
+  AccessibilityMode accessibility_mode = AccessibilityMode::OFF;
 
   std::string title;
   GURL url;
@@ -147,11 +147,11 @@ bool HandleRequestCallback(BrowserContext* current_context,
       BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode();
   bool disabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableRendererAccessibility);
-  bool native = 0 != (mode & ACCESSIBILITY_MODE_FLAG_NATIVE_APIS);
-  bool web = 0 != (mode & ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS);
-  bool text = 0 != (mode & ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES);
-  bool screenreader = 0 != (mode & ACCESSIBILITY_MODE_FLAG_SCREEN_READER);
-  bool html = 0 != (mode & ACCESSIBILITY_MODE_FLAG_HTML);
+  bool native = 0 != (mode & AccessibilityMode::NATIVE_APIS);
+  bool web = 0 != (mode & AccessibilityMode::WEB_CONTENTS);
+  bool text = 0 != (mode & AccessibilityMode::INLINE_TEXT_BOXES);
+  bool screenreader = 0 != (mode & AccessibilityMode::SCREEN_READER);
+  bool html = 0 != (mode & AccessibilityMode::HTML);
 
   // The "native" and "web" flags are disabled if
   // --disable-renderer-accessibility is set.
@@ -235,7 +235,8 @@ void AccessibilityUI::ToggleAccessibility(const base::ListValue* args) {
   AccessibilityMode current_mode = web_contents->GetAccessibilityMode();
   // Flip the bits represented by |mode|. See accessibility_mode_enums.h for
   // values.
-  current_mode ^= mode;
+  current_mode ^= (AccessibilityMode)mode;
+
   web_contents->SetAccessibilityMode(current_mode);
 }
 
@@ -254,15 +255,15 @@ void AccessibilityUI::SetGlobalFlag(const base::ListValue* args) {
 
   AccessibilityMode new_mode;
   if (flag_name_str == kNative) {
-    new_mode = ACCESSIBILITY_MODE_FLAG_NATIVE_APIS;
+    new_mode = AccessibilityMode::NATIVE_APIS;
   } else if (flag_name_str == kWeb) {
-    new_mode = ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS;
+    new_mode = AccessibilityMode::WEB_CONTENTS;
   } else if (flag_name_str == kText) {
-    new_mode = ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES;
+    new_mode = AccessibilityMode::INLINE_TEXT_BOXES;
   } else if (flag_name_str == kScreenReader) {
-    new_mode = ACCESSIBILITY_MODE_FLAG_SCREEN_READER;
+    new_mode = AccessibilityMode::SCREEN_READER;
   } else if (flag_name_str == kHTML) {
-    new_mode = ACCESSIBILITY_MODE_FLAG_HTML;
+    new_mode = AccessibilityMode::HTML;
   } else {
     NOTREACHED();
     return;
@@ -270,19 +271,18 @@ void AccessibilityUI::SetGlobalFlag(const base::ListValue* args) {
 
   // It doesn't make sense to enable one of the flags that depends on
   // web contents without enabling web contents accessibility too.
-  if (enabled &&
-      (new_mode == ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES ||
-       new_mode == ACCESSIBILITY_MODE_FLAG_SCREEN_READER ||
-       new_mode == ACCESSIBILITY_MODE_FLAG_HTML)) {
-    new_mode |= ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS;
+  if (enabled && (new_mode == AccessibilityMode::INLINE_TEXT_BOXES ||
+                  new_mode == AccessibilityMode::SCREEN_READER ||
+                  new_mode == AccessibilityMode::HTML)) {
+    new_mode |= AccessibilityMode::WEB_CONTENTS;
   }
 
   // Similarly if you disable web accessibility we should remove all
   // flags that depend on it.
-  if (!enabled && new_mode == ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS) {
-    new_mode |= ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES;
-    new_mode |= ACCESSIBILITY_MODE_FLAG_SCREEN_READER;
-    new_mode |= ACCESSIBILITY_MODE_FLAG_HTML;
+  if (!enabled && new_mode == AccessibilityMode::WEB_CONTENTS) {
+    new_mode |= AccessibilityMode::INLINE_TEXT_BOXES;
+    new_mode |= AccessibilityMode::SCREEN_READER;
+    new_mode |= AccessibilityMode::HTML;
   }
 
   BrowserAccessibilityStateImpl* state =
@@ -320,8 +320,8 @@ void AccessibilityUI::RequestAccessibilityTree(const base::ListValue* args) {
       static_cast<WebContentsImpl*>(WebContents::FromRenderViewHost(rvh));
   // No matter the state of the current web_contents, we want to force the mode
   // because we are about to show the accessibility tree
-  web_contents->SetAccessibilityMode(ACCESSIBILITY_MODE_FLAG_NATIVE_APIS |
-                                     ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS);
+  web_contents->SetAccessibilityMode(AccessibilityMode::NATIVE_APIS |
+                                     AccessibilityMode::WEB_CONTENTS);
   std::unique_ptr<AccessibilityTreeFormatter> formatter;
   if (g_show_internal_accessibility_tree)
     formatter.reset(new AccessibilityTreeFormatterBlink());