summaryrefslogtreecommitdiffstats
path: root/views/focus/focus_manager.cc
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-06 00:41:44 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-06 00:41:44 +0000
commit71421c3fc725d9d55acba7a4233525f8b6e07350 (patch)
treee35543c073010cf0c4f78c33f898d97a926551c2 /views/focus/focus_manager.cc
parente0d770da976974190620824d99262aedaa4242ae (diff)
downloadchromium_src-71421c3fc725d9d55acba7a4233525f8b6e07350.zip
chromium_src-71421c3fc725d9d55acba7a4233525f8b6e07350.tar.gz
chromium_src-71421c3fc725d9d55acba7a4233525f8b6e07350.tar.bz2
Fix keyboard accelerator registration issue in views::View.
View should not register the same accelerator target multiple times. BUG=13275 TEST=None Review URL: http://codereview.chromium.org/118242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager.cc')
-rw-r--r--views/focus/focus_manager.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index bab4922..04258bf 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -638,10 +638,8 @@ void FocusManager::RegisterAccelerator(
const Accelerator& accelerator,
AcceleratorTarget* target) {
AcceleratorTargetList& targets = accelerators_[accelerator];
- // TODO(yutak): View::RegisterAccelerators() seems to register the same target
- // multiple times. Should uncomment below after View is fixed.
- // DCHECK(std::find(targets.begin(), targets.end(), target) == targets.end())
- // << "Registering the same target multiple times";
+ DCHECK(std::find(targets.begin(), targets.end(), target) == targets.end())
+ << "Registering the same target multiple times";
targets.push_front(target);
}