Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1879)

Unified Diff: chrome/browser/extensions/extension_commands_global_registry.cc

Issue 109413003: Refactor GlobalShortcutListener. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Mark's comments. Created 7 years 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: chrome/browser/extensions/extension_commands_global_registry.cc
diff --git a/chrome/browser/extensions/extension_commands_global_registry.cc b/chrome/browser/extensions/extension_commands_global_registry.cc
index aa11b9c5c5cf667de5a315d7573ae6d1bb1fc478..453e2057452cc00e67faa4134991a7a12bc6d0e7 100644
--- a/chrome/browser/extensions/extension_commands_global_registry.cc
+++ b/chrome/browser/extensions/extension_commands_global_registry.cc
@@ -5,10 +5,7 @@
#include "chrome/browser/extensions/extension_commands_global_registry.h"
#include "base/lazy_instance.h"
-#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/commands/command_service.h"
-#include "chrome/browser/extensions/extension_keybinding_registry.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/global_shortcut_listener.h"
#include "chrome/browser/profiles/profile.h"
#include "extensions/common/extension.h"
@@ -48,7 +45,6 @@ ExtensionCommandsGlobalRegistry::Get(Profile* profile) {
ExtensionCommandsGlobalRegistry>::GetForProfile(profile);
}
-
void ExtensionCommandsGlobalRegistry::AddExtensionKeybinding(
const extensions::Extension* extension,
const std::string& command_name) {
@@ -71,20 +67,24 @@ void ExtensionCommandsGlobalRegistry::AddExtensionKeybinding(
for (; iter != commands.end(); ++iter) {
if (!command_name.empty() && (iter->second.command_name() != command_name))
continue;
+ const ui::Accelerator& accelerator = iter->second.accelerator();
VLOG(0) << "Adding global keybinding for " << extension->name().c_str()
<< " " << command_name.c_str()
- << " key: " << iter->second.accelerator().GetShortcutText();
+ << " key: " << accelerator.GetShortcutText();
+
+ if (event_targets_.find(accelerator) == event_targets_.end()) {
+ if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(
+ accelerator, this))
+ continue;
+ }
- event_targets_[iter->second.accelerator()].push_back(
+ event_targets_[accelerator].push_back(
std::make_pair(extension->id(), iter->second.command_name()));
// Shortcuts except media keys have only one target in the list. See comment
// about |event_targets_|.
- if (!extensions::CommandService::IsMediaKey(iter->second.accelerator()))
- DCHECK(event_targets_[iter->second.accelerator()].size() == 1);
-
- GlobalShortcutListener::GetInstance()->RegisterAccelerator(
- iter->second.accelerator(), this);
+ if (!extensions::CommandService::IsMediaKey(accelerator))
+ DCHECK_EQ(1u, event_targets_[accelerator].size());
}
}

Powered by Google App Engine
This is Rietveld 408576698