ui/views/controls/button/text_button.cc - Issue 10446010: wip: Add ui::EventType parameter.

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/text_button.cc

Issue 10446010: wip: Add ui::EventType parameter. Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wip - views_unittests Created 8 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:

Index: ui/views/controls/button/text_button.cc

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

index c44b65ebfff84dabc03c821fa182fbb544871aa6..6677ff6a52127ca4cf72a84d23d55876218e0267 100644

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

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

@@ -284,10 +284,15 @@ void TextButtonBase::SetIsDefault(bool is_default) {

if (is_default == is_default_)

return;

is_default_ = is_default;

- if (is_default_)

- AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));

- else

- RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));

+ if (is_default_) {

+ AddAccelerator(ui::Accelerator(ui::VKEY_RETURN,

+ ui::EF_NONE,

+ ui::ET_KEY_PRESSED));

+ } else {

+ RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN,

+ ui::EF_NONE,

+ ui::ET_KEY_PRESSED));

+ }

SchedulePaint();

}

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