DevTools: revert of timestamp format dropdown

third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * 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
@@ skipping 816 matching lines @@
    */
   matchesFilterText(filter) {
     var text = this.contentElement().deepTextContent();
     return text.toLowerCase().includes(filter.toLowerCase());
   }
 
   updateTimestamp() {
     if (!this._contentElement)
       return;
 
-    var format = Common.moduleSetting('consoleTimestampFormat').get();
-    if (format !== Console.ConsoleViewMessage.TimestampFormat.None) {
-      var timestampText = formatTimestamp(this._message.timestamp, format);
+    if (Common.moduleSetting('consoleTimestampsEnabled').get()) {
       if (!this._timestampElement)
         this._timestampElement = createElementWithClass('span', 'console-timestamp');
-      this._timestampElement.textContent = timestampText + ' ';
-      this._timestampElement.title = timestampText;
+      this._timestampElement.textContent = formatTimestamp(this._message.timestamp, false) + ' ';
+      this._timestampElement.title = formatTimestamp(this._message.timestamp, true);
       this._contentElement.insertBefore(this._timestampElement, this._contentElement.firstChild);
     } else if (this._timestampElement) {
       this._timestampElement.remove();
       delete this._timestampElement;
     }
 
     /**
      * @param {number} timestamp
-     * @param {!Console.ConsoleViewMessage.TimestampFormat} format
+     * @param {boolean} full
      * @return {string}
      */
-    function formatTimestamp(timestamp, format) {
+    function formatTimestamp(timestamp, full) {
       var date = new Date(timestamp);
       var yymmdd = date.getFullYear() + '-' + leadZero(date.getMonth() + 1, 2) + '-' + leadZero(date.getDate(), 2);
       var hhmmssfff = leadZero(date.getHours(), 2) + ':' + leadZero(date.getMinutes(), 2) + ':' +
           leadZero(date.getSeconds(), 2) + '.' + leadZero(date.getMilliseconds(), 3);
-      if (format === Console.ConsoleViewMessage.TimestampFormat.Full)
-        return yymmdd + ' ' + hhmmssfff;
-      return hhmmssfff;
+      return full ? (yymmdd + ' ' + hhmmssfff) : hhmmssfff;
 
       /**
        * @param {number} value
        * @param {number} length
        * @return {string}
        */
       function leadZero(value, length) {
         var valueString = value.toString();
         var padding = length - valueString.length;
         return padding <= 0 ? valueString : '0'.repeat(padding) + valueString;
@@ skipping 332 matching lines @@
     }
 
     if (start !== string.length)
       formattedResult.appendChild(Components.linkifyStringAsFragment(string.substring(start)));
 
     return formattedResult;
   }
 };
 
 /**
- * @enum {string}
- */
-Console.ConsoleViewMessage.TimestampFormat = {
-  None: 'none',
-  Full: 'full',
-  Short: 'short'
-};
-
-/**
  * @unrestricted
  */
 Console.ConsoleGroupViewMessage = class extends Console.ConsoleViewMessage {
   /**
    * @param {!SDK.ConsoleMessage} consoleMessage
    * @param {!Components.Linkifier} linkifier
    * @param {number} nestingLevel
    */
   constructor(consoleMessage, linkifier, nestingLevel) {
     console.assert(consoleMessage.isGroupStartMessage());
@@ skipping 26 matching lines @@
   toMessageElement() {
     if (!this._element) {
       super.toMessageElement();
       this._expandGroupIcon = UI.Icon.create('', 'expand-group-icon');
       this._contentElement.insertBefore(this._expandGroupIcon, this._contentElement.firstChild);
       this.setCollapsed(this._collapsed);
     }
     return this._element;
   }
 };