| Index: chrome/browser/ui/webui/extensions/command_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/extensions/command_handler.cc (revision 140271)
|
| +++ chrome/browser/ui/webui/extensions/command_handler.cc (working copy)
|
| @@ -8,6 +8,7 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/extensions/api/commands/command_service.h"
|
| #include "chrome/browser/extensions/api/commands/command_service_factory.h"
|
| +#include "chrome/browser/extensions/extension_keybinding_registry.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -19,7 +20,6 @@
|
|
|
| namespace extensions {
|
|
|
| -
|
| CommandHandler::CommandHandler() {
|
| }
|
|
|
| @@ -34,6 +34,8 @@
|
| l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_EMPTY));
|
| localized_strings->SetString("extensionCommandsInactive",
|
| l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_INACTIVE));
|
| + localized_strings->SetString("extensionCommandsStartTyping",
|
| + l10n_util::GetStringUTF16(IDS_EXTENSION_TYPE_SHORTCUT));
|
| localized_strings->SetString("close", l10n_util::GetStringUTF16(IDS_CLOSE));
|
| }
|
|
|
| @@ -41,6 +43,12 @@
|
| web_ui()->RegisterMessageCallback("extensionCommandsRequestExtensionsData",
|
| base::Bind(&CommandHandler::HandleRequestExtensionsData,
|
| base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback("setShortcutHandlingSuspended",
|
| + base::Bind(&CommandHandler::HandleSetShortcutHandlingSuspended,
|
| + base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback("setExtensionCommandShortcut",
|
| + base::Bind(&CommandHandler::HandleSetExtensionCommandShortcut,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void CommandHandler::HandleRequestExtensionsData(const ListValue* args) {
|
| @@ -50,6 +58,21 @@
|
| "ExtensionCommandsOverlay.returnExtensionsData", results);
|
| }
|
|
|
| +void CommandHandler::HandleSetExtensionCommandShortcut(
|
| + const base::ListValue* args) {
|
| + // TODO(finnur): Implement.
|
| +}
|
| +
|
| +void CommandHandler::HandleSetShortcutHandlingSuspended(const ListValue* args) {
|
| +#if !defined(OS_MACOSX)
|
| + bool suspended;
|
| + if (args->GetBoolean(0, &suspended))
|
| + ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(suspended);
|
| +#else
|
| + NOTIMPLEMENTED();
|
| +#endif
|
| +}
|
| +
|
| void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
|
| ListValue* results = new ListValue;
|
|
|
|
|