Switch AccessibilityMode to be a bitmap

content/browser/android/content_view_core_impl.cc

 // Copyright 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/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 1761 matching lines @@
   RenderWidgetHostImpl* host_impl = RenderWidgetHostImpl::From(
       host_view->GetRenderWidgetHost());
   BrowserAccessibilityState* accessibility_state =
       BrowserAccessibilityState::GetInstance();
   if (enabled) {
     // This enables accessibility globally unless it was explicitly disallowed
     // by a command-line flag.
     accessibility_state->OnScreenReaderDetected();
     // If it was actually enabled globally, enable it for this RenderWidget now.
     if (accessibility_state->IsAccessibleBrowser() && host_impl)
-      host_impl->SetAccessibilityMode(AccessibilityModeComplete);
+      host_impl->AddAccessibilityMode(AccessibilityModeComplete);
   } else {
-    accessibility_state->DisableAccessibility();
+    accessibility_state->ResetAccessibilityMode();
     if (host_impl)
-      host_impl->SetAccessibilityMode(AccessibilityModeOff);
+      host_impl->ResetAccessibilityMode();
   }
 }
 
 void ContentViewCoreImpl::SendSingleTapUma(JNIEnv* env,
                                            jobject obj,
                                            jint type,
                                            jint count) {
   UMA_HISTOGRAM_ENUMERATION("Event.SingleTapType", type, count);
 }
 
@@ skipping 72 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content