DevTools: Decouple shortcuts from actions, introduce shortcut contexts

Source/devtools/front_end/modules.js

Index: Source/devtools/front_end/modules.js
diff --git a/Source/devtools/front_end/modules.js b/Source/devtools/front_end/modules.js
index 9af7506d5c10269e4d241c081e1754c15252918d..c916047c10d332e601521ba11ed330994b3721d5 100644
--- a/Source/devtools/front_end/modules.js
+++ b/Source/devtools/front_end/modules.js
@@ -34,50 +34,61 @@ 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"
-                    }
-                ],
-                className: "WebInspector.Main.HardReloadActionDelegate"
-            },
-            {
-                type: "@WebInspector.ActionDelegate",
-                bindings: [
+                        shortcut: "Shift+Meta+R",
+                        actionId: "main.hard-reload"
+                    },
                     {
-                        shortcut: "Esc"
-                    }
-                ],
-                className: "WebInspector.InspectorView.DrawerToggleActionDelegate"
-            },
-            {
-                type: "@WebInspector.ActionDelegate",
-                bindings: [
+                        shortcut: "Esc",
+                        actionId: "main.toggle-drawer"
+                    },
                     {
-                        shortcut: "Alt+R"
+                        shortcut: "Alt+R",
+                        actionId: "main.debug-reload"
                     }
-                ],
-                className: "WebInspector.Main.DebugReloadActionDelegate"
+                ]
             },
             {
                 type: "ui-setting",
@@ -305,17 +316,23 @@ var allDescriptors = [
             },
             {
                 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",
@@ -497,12 +514,17 @@ var allDescriptors = [
             },
             {
                 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",
@@ -533,12 +555,17 @@ var allDescriptors = [
         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"
+                ]
             }
         ]
     },