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

Unified Diff: Source/devtools/front_end/Main.js

Issue 218613013: DevTools: Decouple shortcuts from actions, introduce shortcut contexts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased patch Created 6 years, 8 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 | « Source/devtools/front_end/KeyboardShortcut.js ('k') | Source/devtools/front_end/ModuleManager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/Main.js
diff --git a/Source/devtools/front_end/Main.js b/Source/devtools/front_end/Main.js
index 905b40a4feb01eadd2c95b79fc34d193ef223837..93ab2fb5f353e17ccaae615a1bdc499bf3a388b1 100644
--- a/Source/devtools/front_end/Main.js
+++ b/Source/devtools/front_end/Main.js
@@ -333,7 +333,8 @@ WebInspector.Main.prototype = {
WebInspector.settings.initializeBackendSettings();
this._registerModules();
- WebInspector.KeyboardShortcut.registerActions();
+ WebInspector.actionRegistry = new WebInspector.ActionRegistry();
+ WebInspector.KeyboardShortcut.registerBindings();
WebInspector.panels = {};
WebInspector.inspectorView = new WebInspector.InspectorView();
@@ -673,10 +674,8 @@ WebInspector.Main.ReloadActionDelegate.prototype = {
*/
handleAction: function()
{
- if (!WebInspector.Dialog.currentInstance()) {
- WebInspector.debuggerModel.skipAllPauses(true, true);
- WebInspector.resourceTreeModel.reloadPage(false);
- }
+ WebInspector.debuggerModel.skipAllPauses(true, true);
+ WebInspector.resourceTreeModel.reloadPage(false);
return true;
}
}
@@ -695,10 +694,8 @@ WebInspector.Main.HardReloadActionDelegate.prototype = {
*/
handleAction: function()
{
- if (!WebInspector.Dialog.currentInstance()) {
- WebInspector.debuggerModel.skipAllPauses(true, true);
- WebInspector.resourceTreeModel.reloadPage(true);
- }
+ WebInspector.debuggerModel.skipAllPauses(true, true);
+ WebInspector.resourceTreeModel.reloadPage(true);
return true;
}
}
« no previous file with comments | « Source/devtools/front_end/KeyboardShortcut.js ('k') | Source/devtools/front_end/ModuleManager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698