DevTools: Implement extensions-based shortcut bindings

Source/devtools/front_end/Main.js

Index: Source/devtools/front_end/Main.js
diff --git a/Source/devtools/front_end/Main.js b/Source/devtools/front_end/Main.js
index 16736e5f3238f1fd0db639988d13cf78a6711418..7c159903b7594107fb7334f220423909e03868f7 100644
--- a/Source/devtools/front_end/Main.js
+++ b/Source/devtools/front_end/Main.js
@@ -52,9 +52,9 @@ WebInspector.Main.prototype = {
     {
         var configuration;
         if (!Capabilities.isMainFrontend) {
-            configuration = ["sources", "timeline", "profiles", "console", "codemirror"];
+            configuration = ["core", "sources", "timeline", "profiles", "console", "codemirror"];

[pfeldman, 2014/03/24 16:54:22]

main?

[apavlov, 2014/03/25 10:03:45]

Done.

         } else {
-            configuration = ["elements", "network", "sources", "timeline", "profiles", "resources", "audits", "console", "codemirror", "extensions"];
+            configuration = ["core", "elements", "network", "sources", "timeline", "profiles", "resources", "audits", "console", "codemirror", "extensions", "settings"];
             if (WebInspector.experimentsSettings.layersPanel.isEnabled())
                 configuration.push("layers");
         }
@@ -338,6 +338,7 @@ WebInspector.Main.prototype = {
         WebInspector.settings.initializeBackendSettings();
 
         this._registerModules();
+        WebInspector.KeyboardShortcut.registerActions();
 
         WebInspector.panels = {};
         WebInspector.inspectorView = new WebInspector.InspectorView();
@@ -538,34 +539,6 @@ WebInspector.Main.prototype = {
         if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.handleShortcut(event))
             return;
 
-        switch (event.keyIdentifier) {
-            case "U+004F": // O key
-            case "U+0050": // P key
-                if (!event.shiftKey && !event.altKey && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
-                    // FIXME: Dependency violation. Introduce pluggable global shortcuts.
-                    /** @type {!WebInspector.SourcesPanel} */ (WebInspector.inspectorView.showPanel("sources")).showGoToSourceDialog();
-                    event.consume(true);
-                }
-                break;
-            case "U+0052": // R key
-                if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
-                    WebInspector.debuggerModel.skipAllPauses(true, true);
-                    WebInspector.resourceTreeModel.reloadPage(event.shiftKey);
-                    event.consume(true);
-                }
-                if (window.DEBUG && event.altKey) {
-                    WebInspector.reload();
-                    return;
-                }
-                break;
-            case "F5":
-                if (!WebInspector.isMac()) {
-                    WebInspector.resourceTreeModel.reloadPage(event.ctrlKey || event.shiftKey);
-                    event.consume(true);
-                }
-                break;
-        }
-
         var isValidZoomShortcut = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) &&
             !event.altKey &&
             !InspectorFrontendHost.isStub;
@@ -573,25 +546,7 @@ WebInspector.Main.prototype = {
             event.consume(true);
             return;
         }
-
-        if (event.keyCode === WebInspector.KeyboardShortcut.Keys.F1.code ||
-            (event.keyCode === WebInspector.KeyboardShortcut.Keys.QuestionMark.code && event.shiftKey && (!WebInspector.isBeingEdited(event.target) || event.metaKey))) {
-            WebInspector.settingsController.showSettingsScreen(WebInspector.SettingsScreen.Tabs.General);
-            event.consume(true);
-            return;
-        }
-
-        var Esc = "U+001B";
-        var doNotOpenDrawerOnEsc = WebInspector.experimentsSettings.doNotOpenDrawerOnEsc.isEnabled();
-        if (event.keyIdentifier === Esc) {
-            if (WebInspector.inspectorView.drawerVisible())
-                WebInspector.inspectorView.closeDrawer();
-            else if (!doNotOpenDrawerOnEsc)
-                WebInspector.inspectorView.showDrawer();
-        }
-
-        if (event.keyCode === WebInspector.KeyboardShortcut.Keys.Tilde.code && event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey)
-            WebInspector.console.show();
+        WebInspector.KeyboardShortcut.handleShortcut(event);
     },
 
     _documentCanCopy: function(event)
@@ -727,6 +682,79 @@ WebInspector.reload = function()
     window.location.reload();
 }
 
+/**
+ * @constructor
+ * @implements {WebInspector.ActionDelegate}
+ */
+WebInspector.Main.SkipAllPausesAndReloadActionDelegate = function()
+{
+}
+
+WebInspector.Main.SkipAllPausesAndReloadActionDelegate.prototype = {
+    /**
+     * @param {!KeyboardEvent=} keyEvent
+     * @return {boolean}
+     */
+    handleAction: function(keyEvent)
+    {
+        WebInspector.debuggerModel.skipAllPauses(true, true);
+        WebInspector.resourceTreeModel.reloadPage(this._isHardReload());
+        return true;
+    },
+
+    /**
+     * @return {boolean}
+     */
+    _isHardReload: function()
+    {
+        return false;

[pfeldman, 2014/03/24 16:54:22]

inline

[apavlov, 2014/03/25 10:03:45]

Done.

+    }
+}
+
+/**
+ * @constructor
+ * @extends {WebInspector.Main.SkipAllPausesAndReloadActionDelegate}
+ */
+WebInspector.Main.SkipAllPausesAndHardReloadActionDelegate = function()
+{
+    WebInspector.Main.SkipAllPausesAndReloadActionDelegate.call(this);
+}
+
+WebInspector.Main.SkipAllPausesAndHardReloadActionDelegate.prototype = {
+    /**
+     * @return {boolean}
+     */
+    _isHardReload: function()
+    {
+        return true;
+    },
+
+    __proto__: WebInspector.Main.SkipAllPausesAndReloadActionDelegate.prototype
+}
+
+/**
+ * @constructor
+ * @implements {WebInspector.ActionDelegate}
+ */
+WebInspector.Main.DebugReloadActionDelegate = function()
+{
+}
+
+WebInspector.Main.DebugReloadActionDelegate.prototype = {
+    /**
+     * @param {!KeyboardEvent=} keyEvent
+     * @return {boolean}
+     */
+    handleAction: function(keyEvent)
+    {
+        if (window.DEBUG) {

[pfeldman, 2014/03/24 16:54:22]

Reload should always work.

[apavlov, 2014/03/25 10:03:45]

Done.

+            WebInspector.reload();
+            return true;
+        }
+        return false;
+    }
+}
+
 new WebInspector.Main();
 
 window.DEBUG = true;