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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/browser_accessibility_com_win.cc

Issue 2981023002: Move Win32 API Histogram code to AXPlatformNode so that it can be shared. (Closed)
Patch Set: Created 3 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/accessibility/platform/ax_platform_node_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/accessibility/browser_accessibility_com_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_com_win.cc b/content/browser/accessibility/browser_accessibility_com_win.cc
index 3558c02f07beb10630a3f9d706f5945f779bf0d6..c594af2a9235f4f3906af7c955246eb5b48ac892 100644
--- a/content/browser/accessibility/browser_accessibility_com_win.cc
+++ b/content/browser/accessibility/browser_accessibility_com_win.cc
@@ -11,7 +11,6 @@
#include <iterator>
#include <utility>
-#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -33,179 +32,6 @@
#include "ui/base/win/accessibility_misc_utils.h"
#include "ui/base/win/atl_module.h"
-namespace {
-
-// IMPORTANT!
-// These values are written to logs. Do not renumber or delete
-// existing items; add new entries to the end of the list.
-enum {
- UMA_API_ACC_DO_DEFAULT_ACTION = 0,
- UMA_API_ACC_HIT_TEST = 1,
- UMA_API_ACC_LOCATION = 2,
- UMA_API_ACC_NAVIGATE = 3,
- UMA_API_ACC_SELECT = 4,
- UMA_API_ADD_SELECTION = 5,
- UMA_API_CONVERT_RETURNED_ELEMENT = 6,
- UMA_API_DO_ACTION = 7,
- UMA_API_GET_ACCESSIBLE_AT = 8,
- UMA_API_GET_ACC_CHILD = 9,
- UMA_API_GET_ACC_CHILD_COUNT = 10,
- UMA_API_GET_ACC_DEFAULT_ACTION = 11,
- UMA_API_GET_ACC_DESCRIPTION = 12,
- UMA_API_GET_ACC_FOCUS = 13,
- UMA_API_GET_ACC_HELP = 14,
- UMA_API_GET_ACC_HELP_TOPIC = 15,
- UMA_API_GET_ACC_KEYBOARD_SHORTCUT = 16,
- UMA_API_GET_ACC_NAME = 17,
- UMA_API_GET_ACC_PARENT = 18,
- UMA_API_GET_ACC_ROLE = 19,
- UMA_API_GET_ACC_SELECTION = 20,
- UMA_API_GET_ACC_STATE = 21,
- UMA_API_GET_ACC_VALUE = 22,
- UMA_API_GET_ANCHOR = 23,
- UMA_API_GET_ANCHOR_TARGET = 24,
- UMA_API_GET_APP_NAME = 25,
- UMA_API_GET_APP_VERSION = 26,
- UMA_API_GET_ATTRIBUTES_FOR_NAMES = 27,
- UMA_API_GET_CAPTION = 28,
- UMA_API_GET_CARET_OFFSET = 29,
- UMA_API_GET_CELL_AT = 30,
- UMA_API_GET_CHARACTER_EXTENTS = 31,
- UMA_API_GET_CHILD_AT = 32,
- UMA_API_GET_CHILD_INDEX = 33,
- UMA_API_GET_CLIPPED_SUBSTRING_BOUNDS = 34,
- UMA_API_GET_COLUMN_DESCRIPTION = 35,
- UMA_API_GET_COLUMN_EXTENT = 36,
- UMA_API_GET_COLUMN_EXTENT_AT = 37,
- UMA_API_GET_COLUMN_HEADER = 38,
- UMA_API_GET_COLUMN_HEADER_CELLS = 39,
- UMA_API_GET_COLUMN_INDEX = 40,
- UMA_API_GET_COMPUTED_STYLE = 41,
- UMA_API_GET_COMPUTED_STYLE_FOR_PROPERTIES = 42,
- UMA_API_GET_CURRENT_VALUE = 43,
- UMA_API_GET_DESCRIPTION = 44,
- UMA_API_GET_DOC_TYPE = 45,
- UMA_API_GET_DOM_TEXT = 46,
- UMA_API_GET_END_INDEX = 47,
- UMA_API_GET_EXTENDED_ROLE = 48,
- UMA_API_GET_EXTENDED_STATES = 49,
- UMA_API_GET_FIRST_CHILD = 50,
- UMA_API_GET_FONT_FAMILY = 51,
- UMA_API_GET_GROUP_POSITION = 52,
- UMA_API_GET_HOST_RAW_ELEMENT_PROVIDER = 53,
- UMA_API_GET_HYPERLINK = 54,
- UMA_API_GET_HYPERLINK_INDEX = 55,
- UMA_API_GET_IACCESSIBLE_PAIR = 56,
- UMA_API_GET_IMAGE_POSITION = 57,
- UMA_API_GET_IMAGE_SIZE = 58,
- UMA_API_GET_INDEX_IN_PARENT = 59,
- UMA_API_GET_INNER_HTML = 60,
- UMA_API_GET_IS_COLUMN_SELECTED = 61,
- UMA_API_GET_IS_ROW_SELECTED = 62,
- UMA_API_GET_IS_SELECTED = 63,
- UMA_API_GET_KEY_BINDING = 64,
- UMA_API_GET_LANGUAGE = 65,
- UMA_API_GET_LAST_CHILD = 66,
- UMA_API_GET_LOCALE = 67,
- UMA_API_GET_LOCALIZED_EXTENDED_ROLE = 68,
- UMA_API_GET_LOCALIZED_EXTENDED_STATES = 69,
- UMA_API_GET_LOCALIZED_NAME = 70,
- UMA_API_GET_LOCAL_INTERFACE = 71,
- UMA_API_GET_MAXIMUM_VALUE = 72,
- UMA_API_GET_MIME_TYPE = 73,
- UMA_API_GET_MINIMUM_VALUE = 74,
- UMA_API_GET_NAME = 75,
- UMA_API_GET_NAMESPACE_URI_FOR_ID = 76,
- UMA_API_GET_NEW_TEXT = 77,
- UMA_API_GET_NEXT_SIBLING = 78,
- UMA_API_GET_NODE_INFO = 79,
- UMA_API_GET_N_CHARACTERS = 80,
- UMA_API_GET_N_COLUMNS = 81,
- UMA_API_GET_N_EXTENDED_STATES = 82,
- UMA_API_GET_N_HYPERLINKS = 83,
- UMA_API_GET_N_RELATIONS = 84,
- UMA_API_GET_N_ROWS = 85,
- UMA_API_GET_N_SELECTED_CELLS = 86,
- UMA_API_GET_N_SELECTED_CHILDREN = 87,
- UMA_API_GET_N_SELECTED_COLUMNS = 88,
- UMA_API_GET_N_SELECTED_ROWS = 89,
- UMA_API_GET_N_SELECTIONS = 90,
- UMA_API_GET_OBJECT_FOR_CHILD = 91,
- UMA_API_GET_OFFSET_AT_POINT = 92,
- UMA_API_GET_OLD_TEXT = 93,
- UMA_API_GET_PARENT_NODE = 94,
- UMA_API_GET_PATTERN_PROVIDER = 95,
- UMA_API_GET_PREVIOUS_SIBLING = 96,
- UMA_API_GET_PROPERTY_VALUE = 97,
- UMA_API_GET_PROVIDER_OPTIONS = 98,
- UMA_API_GET_RELATION = 99,
- UMA_API_GET_RELATIONS = 100,
- UMA_API_GET_ROW_COLUMN_EXTENTS = 101,
- UMA_API_GET_ROW_COLUMN_EXTENTS_AT_INDEX = 102,
- UMA_API_GET_ROW_DESCRIPTION = 103,
- UMA_API_GET_ROW_EXTENT = 104,
- UMA_API_GET_ROW_EXTENT_AT = 105,
- UMA_API_GET_ROW_HEADER = 106,
- UMA_API_GET_ROW_HEADER_CELLS = 107,
- UMA_API_GET_ROW_INDEX = 108,
- UMA_API_GET_RUNTIME_ID = 109,
- UMA_API_GET_SELECTED_CELLS = 110,
- UMA_API_GET_SELECTED_CHILDREN = 111,
- UMA_API_GET_SELECTED_COLUMNS = 112,
- UMA_API_GET_SELECTED_ROWS = 113,
- UMA_API_GET_SELECTION = 114,
- UMA_API_GET_START_INDEX = 115,
- UMA_API_GET_STATES = 116,
- UMA_API_GET_SUMMARY = 117,
- UMA_API_GET_TABLE = 118,
- UMA_API_GET_TEXT = 119,
- UMA_API_GET_TEXT_AFTER_OFFSET = 120,
- UMA_API_GET_TEXT_AT_OFFSET = 121,
- UMA_API_GET_TEXT_BEFORE_OFFSET = 122,
- UMA_API_GET_TITLE = 123,
- UMA_API_GET_TOOLKIT_NAME = 124,
- UMA_API_GET_TOOLKIT_VERSION = 125,
- UMA_API_GET_UNCLIPPED_SUBSTRING_BOUNDS = 126,
- UMA_API_GET_UNIQUE_ID = 127,
- UMA_API_GET_URL = 128,
- UMA_API_GET_VALID = 129,
- UMA_API_GET_WINDOW_HANDLE = 130,
- UMA_API_IA2_GET_ATTRIBUTES = 131,
- UMA_API_IA2_SCROLL_TO = 132,
- UMA_API_IAACTION_GET_DESCRIPTION = 133,
- UMA_API_IATEXT_GET_ATTRIBUTES = 134,
- UMA_API_ISIMPLEDOMNODE_GET_ATTRIBUTES = 135,
- UMA_API_ISIMPLEDOMNODE_SCROLL_TO = 136,
- UMA_API_N_ACTIONS = 137,
- UMA_API_PUT_ALTERNATE_VIEW_MEDIA_TYPES = 138,
- UMA_API_QUERY_SERVICE = 139,
- UMA_API_REMOVE_SELECTION = 140,
- UMA_API_ROLE = 141,
- UMA_API_SCROLL_SUBSTRING_TO = 142,
- UMA_API_SCROLL_SUBSTRING_TO_POINT = 143,
- UMA_API_SCROLL_TO_POINT = 144,
- UMA_API_SCROLL_TO_SUBSTRING = 145,
- UMA_API_SELECT_COLUMN = 146,
- UMA_API_SELECT_ROW = 147,
- UMA_API_SET_CARET_OFFSET = 148,
- UMA_API_SET_CURRENT_VALUE = 149,
- UMA_API_SET_SELECTION = 150,
- UMA_API_TABLE2_GET_SELECTED_COLUMNS = 151,
- UMA_API_TABLE2_GET_SELECTED_ROWS = 152,
- UMA_API_TABLECELL_GET_COLUMN_INDEX = 153,
- UMA_API_TABLECELL_GET_IS_SELECTED = 154,
- UMA_API_TABLECELL_GET_ROW_INDEX = 155,
- UMA_API_UNSELECT_COLUMN = 156,
- UMA_API_UNSELECT_ROW = 157,
-
- // This must always be the last enum. It's okay for its value to
- // increase, but none of the other enum values may change.
- UMA_API_MAX
-};
-
-#define WIN_ACCESSIBILITY_API_HISTOGRAM(enum_value) \
- UMA_HISTOGRAM_ENUMERATION("Accessibility.WinAPIs", enum_value, UMA_API_MAX)
-
// There is no easy way to decouple |kScreenReader| and |kHTML| accessibility
// modes when Windows screen readers are used. For example, certain roles use
// the HTML tag name. Input fields require their type attribute to be exposed.
@@ -217,8 +43,6 @@ const WCHAR* const IA2_RELATION_DETAILS = L"details";
const WCHAR* const IA2_RELATION_DETAILS_FOR = L"detailsFor";
const WCHAR* const IA2_RELATION_ERROR_MESSAGE = L"errorMessage";
-} // namespace
-
namespace content {
using AXPlatformPositionInstance = AXPlatformPosition::AXPositionInstance;
@@ -426,8 +250,6 @@ BrowserAccessibilityComWin::~BrowserAccessibilityComWin() {
//
HRESULT BrowserAccessibilityComWin::accDoDefaultAction(VARIANT var_id) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_DO_DEFAULT_ACTION);
-
if (!owner())
return E_FAIL;
@@ -437,8 +259,6 @@ HRESULT BrowserAccessibilityComWin::accDoDefaultAction(VARIANT var_id) {
STDMETHODIMP BrowserAccessibilityComWin::accHitTest(LONG x_left,
LONG y_top,
VARIANT* child) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_HIT_TEST);
-
if (!owner())
return E_FAIL;
@@ -450,7 +270,6 @@ STDMETHODIMP BrowserAccessibilityComWin::accLocation(LONG* x_left,
LONG* width,
LONG* height,
VARIANT var_id) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_LOCATION);
if (!owner())
return E_FAIL;
@@ -460,7 +279,6 @@ STDMETHODIMP BrowserAccessibilityComWin::accLocation(LONG* x_left,
STDMETHODIMP BrowserAccessibilityComWin::accNavigate(LONG nav_dir,
VARIANT start,
VARIANT* end) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_NAVIGATE);
if (!owner())
return E_FAIL;
@@ -469,7 +287,6 @@ STDMETHODIMP BrowserAccessibilityComWin::accNavigate(LONG nav_dir,
STDMETHODIMP BrowserAccessibilityComWin::get_accChild(VARIANT var_child,
IDispatch** disp_child) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_CHILD);
if (!owner())
return E_FAIL;
@@ -477,7 +294,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accChild(VARIANT var_child,
}
STDMETHODIMP BrowserAccessibilityComWin::get_accChildCount(LONG* child_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_CHILD_COUNT);
if (!owner())
return E_FAIL;
@@ -487,7 +303,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accChildCount(LONG* child_count) {
STDMETHODIMP BrowserAccessibilityComWin::get_accDefaultAction(
VARIANT var_id,
BSTR* def_action) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_DEFAULT_ACTION);
if (!owner())
return E_FAIL;
@@ -497,7 +312,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accDefaultAction(
STDMETHODIMP BrowserAccessibilityComWin::get_accDescription(VARIANT var_id,
BSTR* desc) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_DESCRIPTION);
if (!owner())
return E_FAIL;
@@ -505,7 +319,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accDescription(VARIANT var_id,
}
STDMETHODIMP BrowserAccessibilityComWin::get_accFocus(VARIANT* focus_child) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_FOCUS);
if (!owner())
return E_FAIL;
@@ -514,7 +327,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accFocus(VARIANT* focus_child) {
STDMETHODIMP BrowserAccessibilityComWin::get_accHelp(VARIANT var_id,
BSTR* help) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_HELP);
if (!owner())
return E_FAIL;
@@ -524,7 +336,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accHelp(VARIANT var_id,
STDMETHODIMP BrowserAccessibilityComWin::get_accKeyboardShortcut(
VARIANT var_id,
BSTR* acc_key) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_KEYBOARD_SHORTCUT);
if (!owner())
return E_FAIL;
@@ -533,7 +344,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accKeyboardShortcut(
STDMETHODIMP BrowserAccessibilityComWin::get_accName(VARIANT var_id,
BSTR* name) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_NAME);
if (!owner())
return E_FAIL;
@@ -542,7 +352,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accName(VARIANT var_id,
STDMETHODIMP BrowserAccessibilityComWin::get_accParent(
IDispatch** disp_parent) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_PARENT);
if (!owner())
return E_FAIL;
@@ -551,7 +360,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accParent(
STDMETHODIMP BrowserAccessibilityComWin::get_accRole(VARIANT var_id,
VARIANT* role) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_ROLE);
if (!owner())
return E_FAIL;
@@ -560,7 +368,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accRole(VARIANT var_id,
STDMETHODIMP BrowserAccessibilityComWin::get_accState(VARIANT var_id,
VARIANT* state) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_STATE);
if (!owner())
return E_FAIL;
@@ -583,7 +390,6 @@ bool BrowserAccessibilityComWin::IsRangeValueSupported() {
STDMETHODIMP BrowserAccessibilityComWin::get_accValue(VARIANT var_id,
BSTR* value) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_VALUE);
if (!owner())
return E_FAIL;
@@ -593,12 +399,10 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accValue(VARIANT var_id,
STDMETHODIMP BrowserAccessibilityComWin::get_accHelpTopic(BSTR* help_file,
VARIANT var_id,
LONG* topic_id) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_HELP_TOPIC);
return AXPlatformNodeWin::get_accHelpTopic(help_file, var_id, topic_id);
}
STDMETHODIMP BrowserAccessibilityComWin::get_accSelection(VARIANT* selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_SELECTION);
if (!owner())
return E_FAIL;
@@ -607,7 +411,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accSelection(VARIANT* selected) {
STDMETHODIMP BrowserAccessibilityComWin::accSelect(LONG flags_sel,
VARIANT var_id) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_SELECT);
if (!owner())
return E_FAIL;
@@ -634,7 +437,6 @@ BrowserAccessibilityComWin::put_accValue(VARIANT var_id, BSTR put_val) {
//
STDMETHODIMP BrowserAccessibilityComWin::role(LONG* role) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ROLE);
if (!owner())
return E_FAIL;
@@ -666,7 +468,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_attributes(BSTR* attributes) {
}
STDMETHODIMP BrowserAccessibilityComWin::get_states(AccessibleStates* states) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_STATES);
if (!owner())
return E_FAIL;
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
@@ -1063,7 +864,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accessibleAt(
long row,
long column,
IUnknown** accessible) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACCESSIBLE_AT);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1072,7 +872,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_accessibleAt(
}
STDMETHODIMP BrowserAccessibilityComWin::get_caption(IUnknown** accessible) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CAPTION);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1083,7 +882,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_caption(IUnknown** accessible) {
STDMETHODIMP BrowserAccessibilityComWin::get_childIndex(long row,
long column,
long* cell_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHILD_INDEX);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1094,7 +892,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_childIndex(long row,
STDMETHODIMP BrowserAccessibilityComWin::get_columnDescription(
long column,
BSTR* description) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_DESCRIPTION);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1106,7 +903,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnExtentAt(
long row,
long column,
long* n_columns_spanned) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT_AT);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1117,7 +913,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnExtentAt(
STDMETHODIMP BrowserAccessibilityComWin::get_columnHeader(
IAccessibleTable** accessible_table,
long* starting_row_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
@@ -1129,7 +924,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnHeader(
STDMETHODIMP BrowserAccessibilityComWin::get_columnIndex(long cell_index,
long* column_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_INDEX);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1138,7 +932,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnIndex(long cell_index,
}
STDMETHODIMP BrowserAccessibilityComWin::get_nColumns(long* column_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_COLUMNS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1147,7 +940,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_nColumns(long* column_count) {
}
STDMETHODIMP BrowserAccessibilityComWin::get_nRows(long* row_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_ROWS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1157,7 +949,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_nRows(long* row_count) {
STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedChildren(
long* cell_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CHILDREN);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1167,7 +958,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedChildren(
STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedColumns(
long* column_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_COLUMNS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1176,7 +966,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedColumns(
}
STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedRows(long* row_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_ROWS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1186,7 +975,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedRows(long* row_count) {
STDMETHODIMP BrowserAccessibilityComWin::get_rowDescription(long row,
BSTR* description) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_DESCRIPTION);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1197,7 +985,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowDescription(long row,
STDMETHODIMP BrowserAccessibilityComWin::get_rowExtentAt(long row,
long column,
long* n_rows_spanned) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT_AT);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1208,7 +995,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowExtentAt(long row,
STDMETHODIMP BrowserAccessibilityComWin::get_rowHeader(
IAccessibleTable** accessible_table,
long* starting_column_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1219,7 +1005,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowHeader(
STDMETHODIMP BrowserAccessibilityComWin::get_rowIndex(long cell_index,
long* row_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_INDEX);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1231,7 +1016,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedChildren(
long max_children,
long** children,
long* n_children) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CHILDREN);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1243,7 +1027,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedChildren(
STDMETHODIMP BrowserAccessibilityComWin::get_selectedColumns(long max_columns,
long** columns,
long* n_columns) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_COLUMNS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1255,7 +1038,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedColumns(long max_columns,
STDMETHODIMP BrowserAccessibilityComWin::get_selectedRows(long max_rows,
long** rows,
long* n_rows) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_ROWS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1264,7 +1046,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedRows(long max_rows,
}
STDMETHODIMP BrowserAccessibilityComWin::get_summary(IUnknown** accessible) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SUMMARY);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1275,7 +1056,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_summary(IUnknown** accessible) {
STDMETHODIMP BrowserAccessibilityComWin::get_isColumnSelected(
long column,
boolean* is_selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_COLUMN_SELECTED);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1286,7 +1066,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_isColumnSelected(
STDMETHODIMP BrowserAccessibilityComWin::get_isRowSelected(
long row,
boolean* is_selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_ROW_SELECTED);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1297,7 +1076,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_isRowSelected(
STDMETHODIMP BrowserAccessibilityComWin::get_isSelected(long row,
long column,
boolean* is_selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_SELECTED);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1312,7 +1090,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowColumnExtentsAtIndex(
long* row_extents,
long* column_extents,
boolean* is_selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS_AT_INDEX);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1322,7 +1099,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowColumnExtentsAtIndex(
}
STDMETHODIMP BrowserAccessibilityComWin::selectRow(long row) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_ROW);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1331,7 +1107,6 @@ STDMETHODIMP BrowserAccessibilityComWin::selectRow(long row) {
}
STDMETHODIMP BrowserAccessibilityComWin::selectColumn(long column) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_COLUMN);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1340,7 +1115,6 @@ STDMETHODIMP BrowserAccessibilityComWin::selectColumn(long column) {
}
STDMETHODIMP BrowserAccessibilityComWin::unselectRow(long row) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_ROW);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1349,7 +1123,6 @@ STDMETHODIMP BrowserAccessibilityComWin::unselectRow(long row) {
}
STDMETHODIMP BrowserAccessibilityComWin::unselectColumn(long column) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_COLUMN);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1372,7 +1145,6 @@ BrowserAccessibilityComWin::get_modelChange(IA2TableModelChange* model_change) {
STDMETHODIMP BrowserAccessibilityComWin::get_cellAt(long row,
long column,
IUnknown** cell) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CELL_AT);
AddAccessibilityModeFlags(AccessibilityMode::kScreenReader);
if (!owner())
return E_FAIL;
@@ -1381,7 +1153,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_cellAt(long row,
}
STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedCells(long* cell_count) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CELLS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1392,7 +1163,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_nSelectedCells(long* cell_count) {
STDMETHODIMP BrowserAccessibilityComWin::get_selectedCells(
IUnknown*** cells,
long* n_selected_cells) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CELLS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1402,7 +1172,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedCells(
STDMETHODIMP BrowserAccessibilityComWin::get_selectedColumns(long** columns,
long* n_columns) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_COLUMNS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1412,7 +1181,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedColumns(long** columns,
STDMETHODIMP BrowserAccessibilityComWin::get_selectedRows(long** rows,
long* n_rows) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_ROWS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1426,7 +1194,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_selectedRows(long** rows,
STDMETHODIMP BrowserAccessibilityComWin::get_columnExtent(
long* n_columns_spanned) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1437,7 +1204,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnExtent(
STDMETHODIMP BrowserAccessibilityComWin::get_columnHeaderCells(
IUnknown*** cell_accessibles,
long* n_column_header_cells) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER_CELLS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1447,7 +1213,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnHeaderCells(
}
STDMETHODIMP BrowserAccessibilityComWin::get_columnIndex(long* column_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_COLUMN_INDEX);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1456,7 +1221,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_columnIndex(long* column_index) {
}
STDMETHODIMP BrowserAccessibilityComWin::get_rowExtent(long* n_rows_spanned) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1467,7 +1231,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowExtent(long* n_rows_spanned) {
STDMETHODIMP BrowserAccessibilityComWin::get_rowHeaderCells(
IUnknown*** cell_accessibles,
long* n_row_header_cells) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER_CELLS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1477,7 +1240,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowHeaderCells(
}
STDMETHODIMP BrowserAccessibilityComWin::get_rowIndex(long* row_index) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_ROW_INDEX);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1486,7 +1248,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowIndex(long* row_index) {
}
STDMETHODIMP BrowserAccessibilityComWin::get_isSelected(boolean* is_selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_IS_SELECTED);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1500,7 +1261,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowColumnExtents(
long* row_extents,
long* column_extents,
boolean* is_selected) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
@@ -1510,7 +1270,6 @@ STDMETHODIMP BrowserAccessibilityComWin::get_rowColumnExtents(
}
STDMETHODIMP BrowserAccessibilityComWin::get_table(IUnknown** table) {
- WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TABLE);
AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
if (!owner())
return E_FAIL;
« no previous file with comments | « no previous file | ui/accessibility/platform/ax_platform_node_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698