Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: content/renderer/accessibility/blink_ax_enum_conversion.cc

Issue 1511603002: Merge to m48: Stops using SYSTEM_STATE_INDETERMINATE as it makes radio buttons appear to have a mix… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/renderer/accessibility/blink_ax_enum_conversion.h" 5 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 16 matching lines...) Expand all
27 if (o.isFocused()) 27 if (o.isFocused())
28 state |= (1 << ui::AX_STATE_FOCUSED); 28 state |= (1 << ui::AX_STATE_FOCUSED);
29 29
30 if (o.role() == blink::WebAXRolePopUpButton || 30 if (o.role() == blink::WebAXRolePopUpButton ||
31 o.ariaHasPopup()) 31 o.ariaHasPopup())
32 state |= (1 << ui::AX_STATE_HASPOPUP); 32 state |= (1 << ui::AX_STATE_HASPOPUP);
33 33
34 if (o.isHovered()) 34 if (o.isHovered())
35 state |= (1 << ui::AX_STATE_HOVERED); 35 state |= (1 << ui::AX_STATE_HOVERED);
36 36
37 if (o.isIndeterminate())
38 state |= (1 << ui::AX_STATE_INDETERMINATE);
39
40 if (!o.isVisible()) 37 if (!o.isVisible())
41 state |= (1 << ui::AX_STATE_INVISIBLE); 38 state |= (1 << ui::AX_STATE_INVISIBLE);
42 39
43 if (o.isLinked()) 40 if (o.isLinked())
44 state |= (1 << ui::AX_STATE_LINKED); 41 state |= (1 << ui::AX_STATE_LINKED);
45 42
46 if (o.isMultiline()) 43 if (o.isMultiline())
47 state |= (1 << ui::AX_STATE_MULTILINE); 44 state |= (1 << ui::AX_STATE_MULTILINE);
48 45
49 if (o.isMultiSelectable()) 46 if (o.isMultiSelectable())
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 case blink::WebAXSortDirectionOther: 469 case blink::WebAXSortDirectionOther:
473 return ui::AX_SORT_DIRECTION_OTHER; 470 return ui::AX_SORT_DIRECTION_OTHER;
474 default: 471 default:
475 NOTREACHED(); 472 NOTREACHED();
476 } 473 }
477 474
478 return ui::AX_SORT_DIRECTION_NONE; 475 return ui::AX_SORT_DIRECTION_NONE;
479 } 476 }
480 477
481 } // Namespace content. 478 } // Namespace content.
OLDNEW
« no previous file with comments | « content/browser/accessibility/browser_accessibility_win.cc ('k') | content/renderer/accessibility/blink_ax_tree_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698