OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/logging.h" | 5 #include "base/logging.h" |
6 #include "content/browser/accessibility/accessibility_mode_helper.h" | 6 #include "content/browser/accessibility/accessibility_mode_helper.h" |
7 | 7 |
8 #if defined(OS_WIN) | 8 #if defined(OS_WIN) |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/win/windows_version.h" | 10 #include "base/win/windows_version.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 case AccessibilityModeEditableTextOnly: | 23 case AccessibilityModeEditableTextOnly: |
24 case AccessibilityModeTreeOnly: | 24 case AccessibilityModeTreeOnly: |
25 return mode; | 25 return mode; |
26 } | 26 } |
27 DCHECK(false) << "Could not convert to AccessibilityMode: " << int_mode; | 27 DCHECK(false) << "Could not convert to AccessibilityMode: " << int_mode; |
28 return AccessibilityModeOff; | 28 return AccessibilityModeOff; |
29 } | 29 } |
30 | 30 |
31 } // namespace | 31 } // namespace |
32 | 32 |
| 33 AccessibilityMode GetBaseAccessibilityMode() { |
| 34 AccessibilityMode accessibility_mode = AccessibilityModeOff; |
| 35 #if defined(OS_WIN) |
| 36 // On Windows 8, always enable accessibility for editable text controls |
| 37 // so we can show the virtual keyboard when one is enabled. |
| 38 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && |
| 39 !CommandLine::ForCurrentProcess()->HasSwitch( |
| 40 switches::kDisableRendererAccessibility)) { |
| 41 accessibility_mode = AccessibilityModeEditableTextOnly; |
| 42 } |
| 43 #endif // defined(OS_WIN) |
| 44 return accessibility_mode; |
| 45 } |
| 46 |
33 AccessibilityMode AddAccessibilityModeTo(AccessibilityMode to, | 47 AccessibilityMode AddAccessibilityModeTo(AccessibilityMode to, |
34 AccessibilityMode mode_to_add) { | 48 AccessibilityMode mode_to_add) { |
35 return CastToAccessibilityMode(to | mode_to_add); | 49 return CastToAccessibilityMode(to | mode_to_add); |
36 } | 50 } |
37 | 51 |
38 AccessibilityMode RemoveAccessibilityModeFrom( | 52 AccessibilityMode RemoveAccessibilityModeFrom( |
39 AccessibilityMode from, | 53 AccessibilityMode from, |
40 AccessibilityMode mode_to_remove) { | 54 AccessibilityMode mode_to_remove) { |
41 unsigned int new_mode = from ^ (mode_to_remove & from); | 55 unsigned int new_mode = from ^ (mode_to_remove & from); |
42 #if defined(OS_WIN) | 56 #if defined(OS_WIN) |
43 // On Windows 8, always enable accessibility for editable text controls | 57 // On Windows 8, always enable accessibility for editable text controls |
44 // so we can show the virtual keyboard when one is enabled. | 58 // so we can show the virtual keyboard when one is enabled. |
45 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && | 59 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && |
46 !CommandLine::ForCurrentProcess()->HasSwitch( | 60 !CommandLine::ForCurrentProcess()->HasSwitch( |
47 switches::kDisableRendererAccessibility)) { | 61 switches::kDisableRendererAccessibility)) { |
48 if ((from & AccessibilityModeEditableTextOnly) == | 62 if ((from & AccessibilityModeEditableTextOnly) == |
49 AccessibilityModeEditableTextOnly) | 63 AccessibilityModeEditableTextOnly) |
50 new_mode |= AccessibilityModeEditableTextOnly; | 64 new_mode |= AccessibilityModeEditableTextOnly; |
51 } | 65 } |
52 #endif // defined(OS_WIN) | 66 #endif // defined(OS_WIN) |
53 | 67 |
54 return CastToAccessibilityMode(new_mode); | 68 return CastToAccessibilityMode(new_mode); |
55 } | 69 } |
56 | 70 |
57 } // namespace content | 71 } // namespace content |
OLD | NEW |