summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 02:12:56 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 02:12:56 +0000
commit64bc894cd8fc653d88ad29951468342638fd15d3 (patch)
treef992b3fbeb461d6748e997b3740bbbf306d294c0 /views
parent8a91a0a06c35b1487949c4037954e08172827f90 (diff)
downloadchromium_src-64bc894cd8fc653d88ad29951468342638fd15d3.zip
chromium_src-64bc894cd8fc653d88ad29951468342638fd15d3.tar.gz
chromium_src-64bc894cd8fc653d88ad29951468342638fd15d3.tar.bz2
Fix a regression in r56766
CustomButton::OnKeyEvent should return false when the event is not handled BUG=chromium-os:6290 TEST=none Review URL: http://codereview.chromium.org/3276007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/button/custom_button.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index e87bae9..04ff856 100644
--- a/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.cc
@@ -197,6 +197,8 @@ bool CustomButton::OnKeyPressed(const KeyEvent& e) {
} else if (e.GetKeyCode() == base::VKEY_RETURN) {
SetState(BS_NORMAL);
NotifyClick(e);
+ } else {
+ return false;
}
return true;
}