DevTools: Decouple shortcuts from actions, introduce shortcut contexts

Source/devtools/front_end/modules.js

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 16 matching lines @@
  */
 
 /**
  * @type {!Array.<!WebInspector.ModuleManager.ModuleDescriptor>}
  */
 var allDescriptors = [
     {
         name: "main",
         extensions: [
             {
+                type: "@WebInspector.ActionRegistryAPI",
+                className: "WebInspector.ActionRegistry"
+            },
+            {
                 type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.Main.ReloadActionDelegate",
+                actionId: "main.reload"
+            },
+            {
+                type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.Main.HardReloadActionDelegate",
+                actionId: "main.hard-reload"
+            },
+            {
+                type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.InspectorView.DrawerToggleActionDelegate",
+                actionId: "main.toggle-drawer"
+            },
+            {
+                type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.Main.DebugReloadActionDelegate",
+                actionId: "main.debug-reload"
+            },
+            {
+                type: "action-bindings",
                 bindings: [
                     {
                         platform: "windows,linux",
-                        shortcut: "F5 Ctrl+R"
+                        shortcut: "F5 Ctrl+R",
+                        actionId: "main.reload"
                     },
                     {
                         platform: "mac",
-                        shortcut: "Meta+R"

[pfeldman, 2014/04/14 13:10:44]

I don't think we should decouple these - too much xml :)

[apavlov, 2014/04/15 13:33:14]

Done.

-                    }
-                ],
-                className: "WebInspector.Main.ReloadActionDelegate"
-            },
-            {
-                type: "@WebInspector.ActionDelegate",
-                bindings: [
+                        shortcut: "Meta+R",
+                        actionId: "main.reload"
+                    },
                     {
                         platform: "windows,linux",
-                        shortcut: "Shift+F5 Ctrl+F5 Ctrl+Shift+F5 Shift+Ctrl+R"
+                        shortcut: "Shift+F5 Ctrl+F5 Ctrl+Shift+F5 Shift+Ctrl+R",
+                        actionId: "main.hard-reload"
                     },
                     {
                         platform: "mac",
-                        shortcut: "Shift+Meta+R"
+                        shortcut: "Shift+Meta+R",
+                        actionId: "main.hard-reload"
+                    },
+                    {
+                        shortcut: "Esc",
+                        actionId: "main.toggle-drawer"
+                    },
+                    {
+                        shortcut: "Alt+R",
+                        actionId: "main.debug-reload"
                     }
-                ],
-                className: "WebInspector.Main.HardReloadActionDelegate"
-            },
-            {
-                type: "@WebInspector.ActionDelegate",
-                bindings: [
-                    {
-                        shortcut: "Esc"
-                    }
-                ],
-                className: "WebInspector.InspectorView.DrawerToggleActionDelegate"
-            },
-            {
-                type: "@WebInspector.ActionDelegate",
-                bindings: [
-                    {
-                        shortcut: "Alt+R"
-                    }
-                ],
-                className: "WebInspector.Main.DebugReloadActionDelegate"
+                ]
             },
             {
                 type: "ui-setting",
                 title: "Disable cache (while DevTools is open)",
                 settingName: "cacheDisabled",
                 settingType: "checkbox"
             },
             {
                 type: "ui-setting",
                 section: "Appearance",
@@ skipping 207 matching lines @@
             },
             {
                 type: "navigator-view",
                 name: "snippets",
                 title: "Snippets",
                 order: 3,
                 className: "WebInspector.SnippetsNavigatorView"
             },
             {
                 type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.SourcesPanel.ShowGoToSourceDialogActionDelegate",
+                actionId: "sources.go-to-source"
+            },
+            {
+                type: "action-bindings",
                 bindings: [
                     {
                         platform: "mac",
-                        shortcut: "Meta+O Meta+P"
+                        shortcut: "Meta+O Meta+P",
+                        actionId: "sources.go-to-source"
                     },
                     {
                         platform: "windows,linux",
-                        shortcut: "Ctrl+O Ctrl+P"
+                        shortcut: "Ctrl+O Ctrl+P",
+                        actionId: "sources.go-to-source"
                     }
-                ],
-                className: "WebInspector.SourcesPanel.ShowGoToSourceDialogActionDelegate"
+                ]
             },
             {
                 type: "ui-setting",
                 settingName: "javaScriptDisabled",
                 settingType: "custom",
                 className: "WebInspector.SourcesPanel.DisableJavaScriptSettingDelegate"
             },
             {
                 type: "ui-setting",
                 section: "Sources",
@@ skipping 161 matching lines @@
                 order: "0",
                 className: "WebInspector.ConsolePanel.WrapperView"
             },
             {
                 type: "@WebInspector.Revealer",
                 contextTypes: ["WebInspector.ConsoleModel"],
                 className: "WebInspector.ConsolePanel.ConsoleRevealer"
             },
             {
                 type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.ConsoleView.ShowConsoleActionDelegate",
+                actionId: "console.show"
+            },
+            {
+                type: "action-bindings",
                 bindings: [
                     {
-                        shortcut: "Ctrl+`"
+                        shortcut: "Ctrl+`",
+                        actionId: "console.show"
                     }
-                ],
-                className: "WebInspector.ConsoleView.ShowConsoleActionDelegate"
+                ]
             },
             {
                 type: "ui-setting",
                 section: "Console",
                 title: "Log XMLHttpRequests",
                 settingName: "monitoringXHREnabled",
                 settingType: "checkbox"
             },
             {
                 type: "ui-setting",
@@ skipping 10 matching lines @@
                 settingType: "checkbox"
             }
         ],
         scripts: [ "ConsolePanel.js" ]
     },
     {
         name: "settings",
         extensions: [
             {
                 type: "@WebInspector.ActionDelegate",
+                className: "WebInspector.SettingsController.SettingsScreenActionDelegate",
+                actionId: "settings.show"
+            },
+            {
+                type: "action-bindings",
                 bindings: [
                     {
-                        shortcut: "F1 Shift+?"
+                        shortcut: "F1 Shift+?",
+                        actionId: "settings.show"
                     }
-                ],
-                className: "WebInspector.SettingsController.SettingsScreenActionDelegate"
+                ]
             }
         ]
     },
     {
         name: "extensions",
         extensions: [
             {
                 type: "@WebInspector.ExtensionServerAPI",
                 className: "WebInspector.ExtensionServer"
             }
@@ skipping 22 matching lines @@
         name: "handler-registry",
         extensions: [
             {
                 type: "@WebInspector.ContextMenu.Provider",
                 contextTypes: ["WebInspector.UISourceCode", "WebInspector.Resource", "WebInspector.NetworkRequest", "Node"],
                 className: "WebInspector.HandlerRegistry.ContextMenuProvider"
             }
         ]
     }
 ];