Switch AccessibilityMode to be a bitmap

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 29378389128a4f753837cb4fe54595c54f4db8d3..ebb3350bf38ead1c2efb3dbb21a7df33aea0e0a6 100644
--- a/content/browser/accessibility/accessibility_ui.cc
+++ b/content/browser/accessibility/accessibility_ui.cc
@@ -49,7 +49,7 @@ base::DictionaryValue* BuildTargetDescriptor(
     const GURL& favicon_url,
     int process_id,
     int route_id,
-    AccessibilityMode accessibility_mode,
+    unsigned int accessibility_mode,
     base::ProcessHandle handle = base::kNullProcessHandle) {
   base::DictionaryValue* target_data = new base::DictionaryValue();
   target_data->SetInteger(kProcessIdField, process_id);
@@ -67,7 +67,7 @@ base::DictionaryValue* BuildTargetDescriptor(RenderViewHost* rvh) {
   WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
   std::string title;
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rvh);
-  AccessibilityMode accessibility_mode = rwhi->accessibility_mode();
+  unsigned int accessibility_mode = rwhi->accessibility_mode();
 
   GURL url;
   GURL favicon_url;
@@ -109,7 +109,7 @@ void SendTargetsData(
 
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->Set("list", rvh_list.release());
-  scoped_ptr<base::FundamentalValue> a11y_mode(new base::FundamentalValue(
+  scoped_ptr<base::FundamentalValue> a11y_mode(base::Value::CreateIntegerValue(
       BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()));
   data->Set("global_a11y_mode", a11y_mode.release());
 
@@ -184,20 +184,20 @@ void AccessibilityUI::ToggleAccessibility(const base::ListValue* args) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rvh);
   if (!rwhi)
     return;
-  AccessibilityMode mode = rwhi->accessibility_mode();
-  if (mode == AccessibilityModeOff)
-    rwhi->SetAccessibilityMode(AccessibilityModeComplete);
+  unsigned int mode = rwhi->accessibility_mode();
+  if (mode & AccessibilityModeFlagRenderer)
+    rwhi->SetRendererAccessibilityMode(true);
   else
-    rwhi->SetAccessibilityMode(AccessibilityModeOff);
+    rwhi->SetRendererAccessibilityMode(false);
 }
 
 void AccessibilityUI::ToggleGlobalAccessibility(const base::ListValue* args) {
   BrowserAccessibilityStateImpl* state =
       BrowserAccessibilityStateImpl::GetInstance();
-  AccessibilityMode mode = state->accessibility_mode();
-  AccessibilityMode new_mode = (mode == AccessibilityModeOff
-                                ? AccessibilityModeComplete
-                                : AccessibilityModeOff);
+  unsigned int mode = state->accessibility_mode();
+  unsigned int new_mode = (mode & AccessibilityModeFlagRenderer

[David Tseng, 2014/01/27 22:16:06]

This whole block is equivalent to xor.

[aboxhall, 2014/01/28 00:18:42]

Facepalm...

Fixed.

+                               ? mode & (~AccessibilityModeFlagRenderer)
+                               : mode | AccessibilityModeFlagRenderer);
   state->SetAccessibilityMode(new_mode);
 }