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

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: Rebase 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 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 case ui::AX_ROLE_POP_UP_BUTTON: 1036 case ui::AX_ROLE_POP_UP_BUTTON:
1037 return ROLE_SYSTEM_BUTTONMENU; 1037 return ROLE_SYSTEM_BUTTONMENU;
1038 case ui::AX_ROLE_CARET: 1038 case ui::AX_ROLE_CARET:
1039 return ROLE_SYSTEM_CARET; 1039 return ROLE_SYSTEM_CARET;
1040 case ui::AX_ROLE_CHECK_BOX: 1040 case ui::AX_ROLE_CHECK_BOX:
1041 return ROLE_SYSTEM_CHECKBUTTON; 1041 return ROLE_SYSTEM_CHECKBUTTON;
1042 case ui::AX_ROLE_COMBO_BOX: 1042 case ui::AX_ROLE_COMBO_BOX:
1043 return ROLE_SYSTEM_COMBOBOX; 1043 return ROLE_SYSTEM_COMBOBOX;
1044 case ui::AX_ROLE_DIALOG: 1044 case ui::AX_ROLE_DIALOG:
1045 return ROLE_SYSTEM_DIALOG; 1045 return ROLE_SYSTEM_DIALOG;
1046 case ui::AX_ROLE_GENERIC_CONTAINER:
1047 return ROLE_SYSTEM_GROUPING;
1046 case ui::AX_ROLE_GROUP: 1048 case ui::AX_ROLE_GROUP:
1047 return ROLE_SYSTEM_GROUPING; 1049 return ROLE_SYSTEM_GROUPING;
1048 case ui::AX_ROLE_IMAGE: 1050 case ui::AX_ROLE_IMAGE:
1049 return ROLE_SYSTEM_GRAPHIC; 1051 return ROLE_SYSTEM_GRAPHIC;
1050 case ui::AX_ROLE_LINK: 1052 case ui::AX_ROLE_LINK:
1051 return ROLE_SYSTEM_LINK; 1053 return ROLE_SYSTEM_LINK;
1052 case ui::AX_ROLE_LOCATION_BAR: 1054 case ui::AX_ROLE_LOCATION_BAR:
1053 return ROLE_SYSTEM_GROUPING; 1055 return ROLE_SYSTEM_GROUPING;
1054 case ui::AX_ROLE_MENU_BAR: 1056 case ui::AX_ROLE_MENU_BAR:
1055 return ROLE_SYSTEM_MENUBAR; 1057 return ROLE_SYSTEM_MENUBAR;
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 1291
1290 AXPlatformNodeBase* base = 1292 AXPlatformNodeBase* base =
1291 FromNativeViewAccessible(node->GetNativeViewAccessible()); 1293 FromNativeViewAccessible(node->GetNativeViewAccessible());
1292 if (base && !IsDescendant(base)) 1294 if (base && !IsDescendant(base))
1293 base = nullptr; 1295 base = nullptr;
1294 1296
1295 return static_cast<AXPlatformNodeWin*>(base); 1297 return static_cast<AXPlatformNodeWin*>(base);
1296 } 1298 }
1297 1299
1298 } // namespace ui 1300 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698