ui/views/controls/menu/menu_item_view.cc - Issue 196133012: Fix incorrect use of AXState caused when refactoring two enums into one.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 196133012: Fix incorrect use of AXState caused when refactoring two enums into one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename SetStateFlag -> AddStateFlag Created 6 years, 9 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

Index: ui/views/controls/menu/menu_item_view.cc

diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc

index 386a23e2ae562461beee27563de80f78b2e8dfc2..9232440e382714c107343d00943a6c0b422be179 100644

--- a/ui/views/controls/menu/menu_item_view.cc

+++ b/ui/views/controls/menu/menu_item_view.cc

@@ -168,12 +168,12 @@ void MenuItemView::GetAccessibleState(ui::AXViewState* state) {

switch (GetType()) {

case SUBMENU:

- state->state |= ui::AX_STATE_HASPOPUP;

+ state->AddStateFlag(ui::AX_STATE_HASPOPUP);

break;

case CHECKBOX:

case RADIO:

- state->state |= GetDelegate()->IsItemChecked(GetCommand()) ?

- ui::AX_STATE_CHECKED : 0;

+ if (GetDelegate()->IsItemChecked(GetCommand()))

+ state->AddStateFlag(ui::AX_STATE_CHECKED);

break;

case NORMAL:

case SEPARATOR:

« no previous file with comments | « ui/views/controls/label_unittest.cc ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »