| Index: ui/base/accelerators/accelerator_manager.cc
|
| diff --git a/ui/base/accelerators/accelerator_manager.cc b/ui/base/accelerators/accelerator_manager.cc
|
| index 0dc4bfc11729f26264483af9038cdd1a76b01119..fdd2e0aa6344f0a83d4f91249652aa8cc83072fc 100644
|
| --- a/ui/base/accelerators/accelerator_manager.cc
|
| +++ b/ui/base/accelerators/accelerator_manager.cc
|
| @@ -19,6 +19,7 @@ AcceleratorManager::~AcceleratorManager() {
|
| void AcceleratorManager::Register(const Accelerator& accelerator,
|
| HandlerPriority priority,
|
| AcceleratorTarget* target) {
|
| + DCHECK(target);
|
| AcceleratorTargetList& targets = accelerators_[accelerator].second;
|
| DCHECK(std::find(targets.begin(), targets.end(), target) == targets.end())
|
| << "Registering the same target multiple times";
|
| @@ -75,6 +76,11 @@ void AcceleratorManager::UnregisterAll(AcceleratorTarget* target) {
|
| }
|
| }
|
|
|
| +bool AcceleratorManager::IsRegistered(const Accelerator& accelerator) const {
|
| + AcceleratorMap::const_iterator map_iter = accelerators_.find(accelerator);
|
| + return map_iter != accelerators_.end() && !map_iter->second.second.empty();
|
| +}
|
| +
|
| bool AcceleratorManager::Process(const Accelerator& accelerator) {
|
| bool result = false;
|
| AcceleratorMap::iterator map_iter = accelerators_.find(accelerator);
|
| @@ -94,14 +100,6 @@ bool AcceleratorManager::Process(const Accelerator& accelerator) {
|
| return result;
|
| }
|
|
|
| -AcceleratorTarget* AcceleratorManager::GetCurrentTarget(
|
| - const Accelerator& accelerator) const {
|
| - AcceleratorMap::const_iterator map_iter = accelerators_.find(accelerator);
|
| - if (map_iter == accelerators_.end() || map_iter->second.second.empty())
|
| - return NULL;
|
| - return map_iter->second.second.front();
|
| -}
|
| -
|
| bool AcceleratorManager::HasPriorityHandler(
|
| const Accelerator& accelerator) const {
|
| AcceleratorMap::const_iterator map_iter = accelerators_.find(accelerator);
|
|
|