views/controls/button/custom_button.cc - Issue 8508055: Move views::Accelerator to ui in order to use it from aura code.

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 9 years, 1 month 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: views/controls/button/custom_button.cc

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

index 05fac7595de9724a55b19581ce1acf6cb470abff..fc0c6b4b0e6a46c08a13a53c201bcf029e4da0c0 100644

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

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

@@ -197,7 +197,7 @@ bool CustomButton::OnKeyReleased(const KeyEvent& event) {

return true;

}

-bool CustomButton::AcceleratorPressed(const Accelerator& accelerator) {

+bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {

if (!View::IsEnabled())

return false;

« no previous file with comments | « views/controls/button/custom_button.h ('k') | views/controls/button/text_button.cc » ('j') | no next file with comments »