DevTools: move the GC button into the memory panel.

third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 366 matching lines @@
     } else {
       this._panelToolbar.appendToolbarItem(screenshotCheckbox);
     }
 
     if (Runtime.experiments.isEnabled('timelineRuleUsageRecording')) {
       this._panelToolbar.appendToolbarItem(this._createSettingCheckbox(
           Common.UIString('CSS coverage'), this._markUnusedCSS, Common.UIString('Mark unused CSS in souces.')));
     }
 
     this._panelToolbar.appendSeparator();
-    var garbageCollectButton = new UI.ToolbarButton(Common.UIString('Collect garbage'), 'largeicon-trash-bin');
-    garbageCollectButton.addEventListener('click', this._garbageCollectButtonClicked, this);
-    this._panelToolbar.appendToolbarItem(garbageCollectButton);
-
-    this._panelToolbar.appendSeparator();
     this._cpuThrottlingCombobox = new UI.ToolbarComboBox(this._onCPUThrottlingChanged.bind(this));
     this._panelToolbar.appendToolbarItem(this._createNetworkConditionsSelect());
     this._panelToolbar.appendToolbarItem(this._cpuThrottlingCombobox);
     this._populateCPUThrottingCombobox();
     this._updateTimelineControls();
   }
 
   /**
    * @return {!UI.ToolbarComboBox}
    */
@@ skipping 15 matching lines @@
      */
     function addGroupingOption(name, value) {
       var option = cpuThrottlingCombobox.createOption(name, '', String(value));
       cpuThrottlingCombobox.addOption(option);
       if (hasSelection || (value && value !== currentRate))
         return;
       cpuThrottlingCombobox.select(option);
       hasSelection = true;
     }
     var predefinedRates = new Map([
-      [1, Common.UIString('No CPU throttling')],
-      [2, Common.UIString('2\xD7 slowdown')],
-      [5, Common.UIString('5\xD7 slowdown')],
-      [10, Common.UIString('10\xD7 slowdown')],
+      [1, Common.UIString('No CPU throttling')], [2, Common.UIString('2\xD7 slowdown')],
+      [5, Common.UIString('5\xD7 slowdown')], [10, Common.UIString('10\xD7 slowdown')],
       [20, Common.UIString('20\xD7 slowdown')]
     ]);
     for (var rate of predefinedRates)
       addGroupingOption(rate[1], rate[0]);
   }
 
   _prepareToLoadTimeline() {
     console.assert(this._state === Timeline.TimelinePanel.State.Idle);
     this._setState(Timeline.TimelinePanel.State.Loading);
   }
@@ skipping 191 matching lines @@
     this._dropTarget.setEnabled(this._state === state.Idle);
   }
 
   _toggleRecording() {
     if (this._state === Timeline.TimelinePanel.State.Idle)
       this._startRecording(true);
     else if (this._state === Timeline.TimelinePanel.State.Recording)
       this._stopRecording();
   }
 
-  _garbageCollectButtonClicked() {
-    var targets = SDK.targetManager.targets();
-    for (var i = 0; i < targets.length; ++i)
-      targets[i].heapProfilerAgent().collectGarbage();
-  }
-
   _clear() {
     if (Runtime.experiments.isEnabled('timelineRuleUsageRecording') && this._markUnusedCSS.get())
       Components.CoverageProfile.instance().reset();
 
     Components.LineLevelProfile.instance().reset();
     this._tracingModel.reset();
     this._model.reset();
     this._showRecordingHelpMessage();
 
     this.requestWindowTimes(0, Infinity);
@@ skipping 1299 matching lines @@
   }
 
   /**
    * @override
    * @param {!SDK.Target} target
    */
   targetRemoved(target) {
     this._targets.remove(target, true);
   }
 };