ui/views/controls/button/custom_button.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/button/custom_button.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/button/custom_button.cc

diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc

index 4890b1373a6a09b8abe538b6f102882870721ac0..0e237a312732e9703f3ec37cd79533f472cd31d7 100644

--- a/ui/views/controls/button/custom_button.cc

+++ b/ui/views/controls/button/custom_button.cc

@@ -288,13 +288,13 @@ void CustomButton::GetAccessibleState(ui::AXViewState* state) {

Button::GetAccessibleState(state);

switch (state_) {

case STATE_HOVERED:

- state->state = ui::AX_STATE_HOVERED;

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

break;

case STATE_PRESSED:

- state->state = ui::AX_STATE_PRESSED;

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

break;

case STATE_DISABLED:

- state->state = ui::AX_STATE_DISABLED;

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

break;

case STATE_NORMAL:

case STATE_COUNT:

« no previous file with comments | « ui/views/controls/button/checkbox.cc ('k') | ui/views/controls/button/menu_button.cc » ('j') | no next file with comments »