DevTools: move throttling options into the secondary toolbar in Performance tab.

third_party/WebKit/Source/devtools/front_end/components/NetworkConditionsSelector.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /**
  * @unrestricted
  */
 Components.NetworkConditionsSelector = class {
   /**
    * @param {function(!Array<!Components.NetworkConditionsGroup>):!Array<?SDK.NetworkManager.Conditions>} populateCallback
    * @param {function(number)} selectCallback
@@ skipping 63 matching lines @@
      * @param {!Array.<!Components.NetworkConditionsGroup>} groups
      * @return {!Array<?SDK.NetworkManager.Conditions>}
      */
     function populate(groups) {
       selectElement.removeChildren();
       options = [];
       for (var i = 0; i < groups.length; ++i) {
         var group = groups[i];
         var groupElement = selectElement.createChild('optgroup');
         groupElement.label = group.title;
-        if (!i) {
-          groupElement.appendChild(new Option(Common.UIString('Add\u2026'), Common.UIString('Add\u2026')));
-          options.push(null);
-        }
         for (var conditions of group.items) {
           var title = Components.NetworkConditionsSelector._conditionsTitle(conditions, true);
           var option = new Option(title.text, title.text);
           option.title = title.title;
           groupElement.appendChild(option);
           options.push(conditions);
         }
+        if (i === groups.length - 1) {
+          groupElement.appendChild(new Option(Common.UIString('Add\u2026'), Common.UIString('Add\u2026')));
+          options.push(null);
+        }
       }
       return options;
     }
 
     function optionSelected() {
-      if (selectElement.selectedIndex === 0)
+      if (selectElement.selectedIndex === selectElement.options.length - 1)
         selector.revealAndUpdate();
       else
         selector.optionSelected(options[selectElement.selectedIndex]);
     }
 
     /**
      * @param {number} index
      */
     function select(index) {
       if (selectElement.selectedIndex !== index)
@@ skipping 82 matching lines @@
         lastNetworkConditions = conditions;
       checkbox.setChecked(conditions === SDK.NetworkManager.OfflineConditions);
     }
     return checkbox;
   }
 
   _populateOptions() {
     var customGroup = {title: Common.UIString('Custom'), items: this._customSetting.get()};
     var presetsGroup = {title: Common.UIString('Presets'), items: Components.NetworkConditionsSelector._presets};
     var disabledGroup = {title: Common.UIString('Disabled'), items: [SDK.NetworkManager.NoThrottlingConditions]};
-    this._options = this._populateCallback([customGroup, presetsGroup, disabledGroup]);
+    this._options = this._populateCallback([disabledGroup, presetsGroup, customGroup]);
     if (!this._conditionsChanged()) {
       for (var i = this._options.length - 1; i >= 0; i--) {
         if (this._options[i]) {
           this.optionSelected(/** @type {!SDK.NetworkManager.Conditions} */ (this._options[i]));
           break;
         }
       }
     }
   }
 
@@ skipping 280 matching lines @@
       [Protocol.Network.ResourcePriority.VeryLow, Common.UIString('Lowest')],
       [Protocol.Network.ResourcePriority.Low, Common.UIString('Low')],
       [Protocol.Network.ResourcePriority.Medium, Common.UIString('Medium')],
       [Protocol.Network.ResourcePriority.High, Common.UIString('High')],
       [Protocol.Network.ResourcePriority.VeryHigh, Common.UIString('Highest')]
     ]);
     Components.uiLabelForPriority._priorityToUILabel = labelMap;
   }
   return labelMap.get(priority) || Common.UIString('Unknown');
 };