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

Side by Side Diff: content/browser/accessibility/browser_accessibility_auralinux.cc

Issue 2518183002: Moved action verbs out of Blink. (Closed)
Patch Set: Added missing braces. Created 4 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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/browser/accessibility/browser_accessibility_auralinux.h" 5 #include "content/browser/accessibility/browser_accessibility_auralinux.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
11 #include "content/browser/accessibility/browser_accessibility_manager_auralinux. h" 12 #include "content/browser/accessibility/browser_accessibility_manager_auralinux. h"
12 #include "content/common/accessibility_messages.h" 13 #include "content/common/accessibility_messages.h"
14 #include "ui/accessibility/ax_text_utils.h"
13 15
14 namespace content { 16 namespace content {
15 17
16 static gpointer browser_accessibility_parent_class = NULL; 18 static gpointer browser_accessibility_parent_class = NULL;
17 19
18 static BrowserAccessibilityAuraLinux* ToBrowserAccessibilityAuraLinux( 20 static BrowserAccessibilityAuraLinux* ToBrowserAccessibilityAuraLinux(
19 BrowserAccessibilityAtk* atk_object) { 21 BrowserAccessibilityAtk* atk_object) {
20 if (!atk_object) 22 if (!atk_object)
21 return NULL; 23 return NULL;
22 24
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return 0; 86 return 0;
85 } 87 }
86 88
87 static const gchar* browser_accessibility_get_name(AtkAction* atk_action, 89 static const gchar* browser_accessibility_get_name(AtkAction* atk_action,
88 gint index) { 90 gint index) {
89 g_return_val_if_fail(ATK_IS_ACTION(atk_action), 0); 91 g_return_val_if_fail(ATK_IS_ACTION(atk_action), 0);
90 g_return_val_if_fail(!index, 0); 92 g_return_val_if_fail(!index, 0);
91 BrowserAccessibilityAuraLinux* obj = 93 BrowserAccessibilityAuraLinux* obj =
92 ToBrowserAccessibilityAuraLinux(atk_action); 94 ToBrowserAccessibilityAuraLinux(atk_action);
93 if (!obj) 95 if (!obj)
94 return 0; 96 return nullptr;
95 97
96 return obj->GetStringAttribute(ui::AX_ATTR_ACTION).c_str(); 98 int action;
99 if (!obj->GetIntAttribute(ui::AX_ATTR_ACTION, &action))
100 return nullptr;
101 base::string16 action_verb =
102 ui::ActionToUnlocalizedString(static_cast<ui::AXSupportedAction>(action));
103 return base::UTF16ToUTF8(action_verb).c_str();
97 } 104 }
98 105
99 static const gchar* browser_accessibility_get_keybinding(AtkAction* atk_action, 106 static const gchar* browser_accessibility_get_keybinding(AtkAction* atk_action,
100 gint index) { 107 gint index) {
101 g_return_val_if_fail(ATK_IS_ACTION(atk_action), 0); 108 g_return_val_if_fail(ATK_IS_ACTION(atk_action), 0);
102 g_return_val_if_fail(!index, 0); 109 g_return_val_if_fail(!index, 0);
103 BrowserAccessibilityAuraLinux* obj = 110 BrowserAccessibilityAuraLinux* obj =
104 ToBrowserAccessibilityAuraLinux(atk_action); 111 ToBrowserAccessibilityAuraLinux(atk_action);
105 if (!obj) 112 if (!obj)
106 return 0; 113 return 0;
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 atk_role_ = ATK_ROLE_SECTION; 960 atk_role_ = ATK_ROLE_SECTION;
954 #endif 961 #endif
955 break; 962 break;
956 default: 963 default:
957 atk_role_ = ATK_ROLE_UNKNOWN; 964 atk_role_ = ATK_ROLE_UNKNOWN;
958 break; 965 break;
959 } 966 }
960 } 967 }
961 968
962 } // namespace content 969 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698