Devtools UI: Show multiple shortcuts, show more shortcuts

Source/devtools/front_end/console/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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 40 matching lines @@
     /** @type {!Array.<!WebInspector.ConsoleViewMessage>} */
     this._visibleViewMessages = [];
     this._urlToMessageCount = {};
     this._hiddenByFilterCount = 0;
 
     /**
      * @type {!Array.<!WebInspector.ConsoleView.RegexMatchRange>}
      */
     this._regexMatchRanges = [];
 
-    this._clearConsoleButton = new WebInspector.ToolbarButton(WebInspector.UIString("Clear console log"), "clear-toolbar-item");
-    this._clearConsoleButton.addEventListener("click", this._requestClearMessages, this);
+    this._clearConsoleButton = WebInspector.ToolbarButton.createActionButton("console.clear");
 
     this._executionContextComboBox = new WebInspector.ToolbarComboBox(null, "console-context");
     this._executionContextComboBox.setMaxWidth(200);
     this._executionContextModel = new WebInspector.ExecutionContextModel(this._executionContextComboBox.selectElement());
 
     this._filter = new WebInspector.ConsoleViewFilter(this);
     this._filter.addEventListener(WebInspector.ConsoleViewFilter.Events.FilterChanged, this._updateMessageList.bind(this));
 
     this._filterBar = new WebInspector.FilterBar("consoleView");
 
@@ skipping 499 matching lines @@
 
         for (var url in this._filter.messageURLFilters) {
             filterSubMenu.appendCheckboxItem(String.sprintf("%s (%d)", new WebInspector.ParsedURL(url).displayName, this._urlToMessageCount[url]), this._filter.removeMessageURLFilter.bind(this._filter, url), true);
             hasFilters = true;
         }
 
         filterSubMenu.setEnabled(hasFilters || (consoleMessage && consoleMessage.url));
         unhideAll.setEnabled(hasFilters);
 
         contextMenu.appendSeparator();
-        contextMenu.appendItem(WebInspector.UIString.capitalize("Clear ^console"), this._requestClearMessages.bind(this));
+        contextMenu.appendAction("console.clear");
         contextMenu.appendItem(WebInspector.UIString("Save as..."), this._saveConsole.bind(this));
 
         var request = consoleMessage ? consoleMessage.request : null;
         if (request && request.resourceType() === WebInspector.resourceTypes.XHR) {
             contextMenu.appendSeparator();
             contextMenu.appendItem(WebInspector.UIString("Replay XHR"), request.replayXHR.bind(request));
         }
 
         contextMenu.show();
     },
@@ skipping 108 matching lines @@
     },
 
     _registerShortcuts: function()
     {
         this._shortcuts = {};
 
         var shortcut = WebInspector.KeyboardShortcut;
         var section = WebInspector.shortcutsScreen.section(WebInspector.UIString("Console"));
 
         var shortcutL = shortcut.makeDescriptor("l", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
-        this._shortcuts[shortcutL.key] = this._requestClearMessages.bind(this);
         var keys = [shortcutL];
         if (WebInspector.isMac()) {
             var shortcutK = shortcut.makeDescriptor("k", WebInspector.KeyboardShortcut.Modifiers.Meta);
-            this._shortcuts[shortcutK.key] = this._requestClearMessages.bind(this);
             keys.unshift(shortcutK);
         }
         section.addAlternateKeys(keys, WebInspector.UIString("Clear console"));
 
         section.addKey(shortcut.makeDescriptor(shortcut.Keys.Tab), WebInspector.UIString("Autocomplete common prefix"));
         section.addKey(shortcut.makeDescriptor(shortcut.Keys.Right), WebInspector.UIString("Accept suggestion"));
 
         var shortcutU = shortcut.makeDescriptor("u", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
         this._shortcuts[shortcutU.key] = this._clearPromptBackwards.bind(this);
         section.addAlternateKeys([shortcutU], WebInspector.UIString("Clear console prompt"));
@@ skipping 13 matching lines @@
         }
 
         section.addKey(shortcut.makeDescriptor(shortcut.Keys.Enter), WebInspector.UIString("Execute command"));
     },
 
     _clearPromptBackwards: function()
     {
         this._prompt.setText("");
     },
 
-    _requestClearMessages: function()
-    {
-        var targets = WebInspector.targetManager.targets();
-        for (var i = 0; i < targets.length; ++i)
-            targets[i].consoleModel.requestClearMessages();
-    },
-
     _promptKeyDown: function(event)
     {
         if (isEnterKey(event)) {
             this._enterKeyPressed(event);
             return;
         }
 
         var shortcut = WebInspector.KeyboardShortcut.makeKeyFromEvent(event);
         var handler = this._shortcuts[shortcut];
         if (handler) {
@@ skipping 516 matching lines @@
     parentGroup: function()
     {
         return this._parentGroup || this;
     },
 }
 
 /**
  * @constructor
  * @implements {WebInspector.ActionDelegate}
  */
-WebInspector.ConsoleView.ShowConsoleActionDelegate = function()
+WebInspector.ConsoleView.ActionDelegate = function()
 {
 }
 
-WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = {
+WebInspector.ConsoleView.ActionDelegate.prototype = {
     /**
      * @override
      * @param {!WebInspector.Context} context
      * @param {string} actionId
      */
     handleAction: function(context, actionId)
     {
-        WebInspector.console.show();
+        if (actionId === "console.show")
+            WebInspector.console.show();
+        else if (actionId === "console.clear")
+            WebInspector.ConsoleModel.clearConsole();
     }
 }
 
 /**
 * @typedef {{messageIndex: number, matchIndex: number}}
 */
 WebInspector.ConsoleView.RegexMatchRange;