Switch AccessibilityMode to be a bitmap

content/browser/accessibility/accessibility_mode_helper.cc

+// Copyright (c) 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 "base/command_line.h"
+#include "content/browser/accessibility/accessibility_mode_helper.h"

[David Tseng, 2014/02/06 19:13:44]

I think this goes above all other includes.

[aboxhall, 2014/02/06 21:04:12]

Oops, done.

+#include "content/public/common/content_switches.h"
+
+namespace content {
+
+unsigned int AddAccessibilityModeTo(unsigned int to,
+                                    AccessibilityMode mode_to_add) {
+  return to | mode_to_add;
+}
+
+unsigned int RemoveAccessibilityModeFrom(unsigned int from,
+                                         AccessibilityMode mode_to_remove) {
+  int new_mode = from ^ (mode_to_remove & from);
+#if defined(OS_WIN)
+  // On Windows 8, always enable accessibility for editable text controls
+  // so we can show the virtual keyboard when one is enabled.
+  if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(

[David Tseng, 2014/02/06 19:13:44]

Seems unexpected to have the addition of this flag as a side effect of removal.
Perhaps just prevent the removal of the editable text flag on Windows 8?

[aboxhall, 2014/02/06 21:04:12]

Done, although note that this code is functionally the same (since it prevents
you from ever getting into a state in which you would actually be adding it as
opposed to keeping it).

+          switches::kDisableRendererAccessibility)) {
+    AddAccessibilityModeTo(new_mode, AccessibilityModeEditableTextOnly);
+  }
+#endif  // defined(OS_WIN)
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kForceRendererAccessibility)) {
+    AddAccessibilityModeTo(new_mode, AccessibilityModeComplete);

[David Tseng, 2014/02/06 19:13:44]

Also, seems odd to have this as a side effect of removal.

[aboxhall, 2014/02/06 21:04:12]

Ok, removed.

+  }
+  return new_mode;
+}
+
+}  // namespace content