| Index: Source/devtools/front_end/Main.js
|
| diff --git a/Source/devtools/front_end/Main.js b/Source/devtools/front_end/Main.js
|
| index 808da1cdb046b909f72c32211c97020d56eab161..8fc4bafcafcaa46cf2e8550331846f48ab557420 100644
|
| --- a/Source/devtools/front_end/Main.js
|
| +++ b/Source/devtools/front_end/Main.js
|
| @@ -332,7 +332,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();
|
| @@ -668,14 +669,13 @@ WebInspector.Main.ReloadActionDelegate = function()
|
|
|
| WebInspector.Main.ReloadActionDelegate.prototype = {
|
| /**
|
| + * @param {!WebInspector.Context} context
|
| * @return {boolean}
|
| */
|
| - handleAction: function()
|
| + handleAction: function(context)
|
| {
|
| - if (!WebInspector.Dialog.currentInstance()) {
|
| - WebInspector.debuggerModel.skipAllPauses(true, true);
|
| - WebInspector.resourceTreeModel.reloadPage(false);
|
| - }
|
| + WebInspector.debuggerModel.skipAllPauses(true, true);
|
| + WebInspector.resourceTreeModel.reloadPage(false);
|
| return true;
|
| }
|
| }
|
| @@ -690,14 +690,13 @@ WebInspector.Main.HardReloadActionDelegate = function()
|
|
|
| WebInspector.Main.HardReloadActionDelegate.prototype = {
|
| /**
|
| + * @param {!WebInspector.Context} context
|
| * @return {boolean}
|
| */
|
| - handleAction: function()
|
| + handleAction: function(context)
|
| {
|
| - if (!WebInspector.Dialog.currentInstance()) {
|
| - WebInspector.debuggerModel.skipAllPauses(true, true);
|
| - WebInspector.resourceTreeModel.reloadPage(true);
|
| - }
|
| + WebInspector.debuggerModel.skipAllPauses(true, true);
|
| + WebInspector.resourceTreeModel.reloadPage(true);
|
| return true;
|
| }
|
| }
|
|
|