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

Side by Side Diff: ui/accessibility/platform/ax_platform_node_win.cc

Issue 2867073003: Name calculation should not include nameFrom:author descendants. (Closed)
Patch Set: Single quote Created 3 years, 7 months 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <atlbase.h> 5 #include <atlbase.h>
6 #include <atlcom.h> 6 #include <atlcom.h>
7 #include <limits.h> 7 #include <limits.h>
8 #include <oleacc.h> 8 #include <oleacc.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 case ui::AX_ROLE_POP_UP_BUTTON: 1041 case ui::AX_ROLE_POP_UP_BUTTON:
1042 return ROLE_SYSTEM_BUTTONMENU; 1042 return ROLE_SYSTEM_BUTTONMENU;
1043 case ui::AX_ROLE_CARET: 1043 case ui::AX_ROLE_CARET:
1044 return ROLE_SYSTEM_CARET; 1044 return ROLE_SYSTEM_CARET;
1045 case ui::AX_ROLE_CHECK_BOX: 1045 case ui::AX_ROLE_CHECK_BOX:
1046 return ROLE_SYSTEM_CHECKBUTTON; 1046 return ROLE_SYSTEM_CHECKBUTTON;
1047 case ui::AX_ROLE_COMBO_BOX: 1047 case ui::AX_ROLE_COMBO_BOX:
1048 return ROLE_SYSTEM_COMBOBOX; 1048 return ROLE_SYSTEM_COMBOBOX;
1049 case ui::AX_ROLE_DIALOG: 1049 case ui::AX_ROLE_DIALOG:
1050 return ROLE_SYSTEM_DIALOG; 1050 return ROLE_SYSTEM_DIALOG;
1051 case ui::AX_ROLE_GENERIC_CONTAINER:
1052 return ROLE_SYSTEM_GROUPING;
1051 case ui::AX_ROLE_GROUP: 1053 case ui::AX_ROLE_GROUP:
1052 return ROLE_SYSTEM_GROUPING; 1054 return ROLE_SYSTEM_GROUPING;
1053 case ui::AX_ROLE_IMAGE: 1055 case ui::AX_ROLE_IMAGE:
1054 return ROLE_SYSTEM_GRAPHIC; 1056 return ROLE_SYSTEM_GRAPHIC;
1055 case ui::AX_ROLE_LINK: 1057 case ui::AX_ROLE_LINK:
1056 return ROLE_SYSTEM_LINK; 1058 return ROLE_SYSTEM_LINK;
1057 case ui::AX_ROLE_LOCATION_BAR: 1059 case ui::AX_ROLE_LOCATION_BAR:
1058 return ROLE_SYSTEM_GROUPING; 1060 return ROLE_SYSTEM_GROUPING;
1059 case ui::AX_ROLE_MENU_BAR: 1061 case ui::AX_ROLE_MENU_BAR:
1060 return ROLE_SYSTEM_MENUBAR; 1062 return ROLE_SYSTEM_MENUBAR;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 1294
1293 AXPlatformNodeBase* base = 1295 AXPlatformNodeBase* base =
1294 FromNativeViewAccessible(node->GetNativeViewAccessible()); 1296 FromNativeViewAccessible(node->GetNativeViewAccessible());
1295 if (base && !IsDescendant(base)) 1297 if (base && !IsDescendant(base))
1296 base = nullptr; 1298 base = nullptr;
1297 1299
1298 return static_cast<AXPlatformNodeWin*>(base); 1300 return static_cast<AXPlatformNodeWin*>(base);
1299 } 1301 }
1300 1302
1301 } // namespace ui 1303 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698