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

Unified Diff: chrome/browser/ui/webui/extensions/command_handler.cc

Issue 10514003: Config UI for Extension Commands (part 1). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months 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
« no previous file with comments | « chrome/browser/ui/webui/extensions/command_handler.h ('k') | ui/views/focus/focus_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,13 +34,21 @@
l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_EMPTY));
localized_strings->SetString("extensionCommandsInactive",
l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_INACTIVE));
- localized_strings->SetString("close", l10n_util::GetStringUTF16(IDS_CLOSE));
+ localized_strings->SetString("extensionCommandsStartTyping",
+ l10n_util::GetStringUTF16(IDS_EXTENSION_TYPE_SHORTCUT));
+ localized_strings->SetString("ok", l10n_util::GetStringUTF16(IDS_OK));
}
void CommandHandler::RegisterMessages() {
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;
« no previous file with comments | « chrome/browser/ui/webui/extensions/command_handler.h ('k') | ui/views/focus/focus_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698