DevTools: unify Network & CPU throttling

third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeToolbar.js

 // Copyright 2016 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
  */
 Emulation.DeviceModeToolbar = class {
   /**
    * @param {!Emulation.DeviceModeModel} model
    * @param {!Common.Setting} showMediaInspectorSetting
    * @param {!Common.Setting} showRulersSetting
    */
   constructor(model, showMediaInspectorSetting, showRulersSetting) {
     this._model = model;
     this._showMediaInspectorSetting = showMediaInspectorSetting;
     this._showRulersSetting = showRulersSetting;
 
     this._deviceOutlineSetting = this._model.deviceOutlineSetting();
     this._showDeviceScaleFactorSetting = Common.settings.createSetting('emulation.showDeviceScaleFactor', false);
     this._showDeviceScaleFactorSetting.addChangeListener(this._updateDeviceScaleFactorVisibility, this);
 
     this._showUserAgentTypeSetting = Common.settings.createSetting('emulation.showUserAgentType', false);
     this._showUserAgentTypeSetting.addChangeListener(this._updateUserAgentTypeVisibility, this);
 
-    this._showNetworkConditionsSetting = Common.settings.createSetting('emulation.showNetworkConditions', false);
-    this._showNetworkConditionsSetting.addChangeListener(this._updateNetworkConditionsVisibility, this);
+    this._showThrottlingConditionsSetting = Common.settings.createSetting('emulation.showNetworkConditions', false);
+    this._showThrottlingConditionsSetting.addChangeListener(this._updateThrottlingVisibility, this);
 
     /** @type {!Map<!Emulation.EmulatedDevice, !Emulation.EmulatedDevice.Mode>} */
     this._lastMode = new Map();
 
     /** @type {!Map<!Emulation.EmulatedDevice, number>} */
     this._lastScale = new Map();
 
     this._element = createElementWithClass('div', 'device-mode-toolbar');
 
     var leftContainer = this._element.createChild('div', 'device-mode-toolbar-spacer');
@@ skipping 142 matching lines @@
         this._wrapToolbarItem(createElementWithClass('div', 'device-mode-empty-toolbar-element')));
     this._modeButton = new UI.ToolbarButton('', 'largeicon-rotate-screen');
     this._modeButton.addEventListener(UI.ToolbarButton.Events.Click, this._modeMenuClicked, this);
     toolbar.appendToolbarItem(this._modeButton);
   }
 
   /**
    * @param {!UI.Toolbar} toolbar
    */
   _fillOptionsToolbar(toolbar) {
-    this._networkConditionsItem = MobileThrottling.NetworkConditionsSelector.createToolbarMenuButton();
-    this._networkConditionsItem.setVisible(this._showNetworkConditionsSetting.get());
-    this._networkConditionsItem.setTitle(Common.UIString('Network throttling'));
-    this._networkConditionsItem.element.style.maxWidth = '140px';
-    toolbar.appendToolbarItem(this._networkConditionsItem);
+    this._throttlingConditionsItem = MobileThrottling.ThrottlingSelector.createToolbarMenuButton();
+    this._throttlingConditionsItem.setVisible(this._showThrottlingConditionsSetting.get());
+    this._throttlingConditionsItem.setTitle(Common.UIString('Mobile throttling'));
+    this._throttlingConditionsItem.element.style.maxWidth = '160px';
+    toolbar.appendToolbarItem(this._throttlingConditionsItem);
 
     var moreOptionsButton = new UI.ToolbarMenuButton(this._appendOptionsMenuItems.bind(this));
     moreOptionsButton.setTitle(Common.UIString('More options'));
     toolbar.appendToolbarItem(moreOptionsButton);
 
     toolbar.appendToolbarItem(
         this._wrapToolbarItem(createElementWithClass('div', 'device-mode-empty-toolbar-element')));
   }
 
   /**
@@ skipping 90 matching lines @@
     appendToggleItem(
         this._showMediaInspectorSetting, Common.UIString('Hide media queries'), Common.UIString('Show media queries'));
     appendToggleItem(this._showRulersSetting, Common.UIString('Hide rulers'), Common.UIString('Show rulers'));
     contextMenu.appendSeparator();
     appendToggleItem(
         this._showDeviceScaleFactorSetting, Common.UIString('Remove device pixel ratio'),
         Common.UIString('Add device pixel ratio'));
     appendToggleItem(
         this._showUserAgentTypeSetting, Common.UIString('Remove device type'), Common.UIString('Add device type'));
     appendToggleItem(
-        this._showNetworkConditionsSetting, Common.UIString('Remove network throttling'),
-        Common.UIString('Add network throttling'));
+        this._showThrottlingConditionsSetting, Common.UIString('Remove mobile throttling'),

[dgozman, 2017/06/13 01:47:08]

Drop 'mobile'. It's a mobile mode anyway.

[chenwilliam, 2017/06/13 21:54:51]

Done.

+        Common.UIString('Add mobile throttling'));
     contextMenu.appendSeparator();
     contextMenu.appendItemsAtLocation('deviceModeMenu');
     contextMenu.appendSeparator();
     contextMenu.appendItem(Common.UIString('Reset to defaults'), this._reset.bind(this));
 
     /**
      * @param {!Common.Setting} setting
      * @param {string} title1
      * @param {string} title2
      * @param {boolean=} disabled
      */
     function appendToggleItem(setting, title1, title2, disabled) {
       if (typeof disabled === 'undefined')
         disabled = model.type() === Emulation.DeviceModeModel.Type.None;
       contextMenu.appendItem(setting.get() ? title1 : title2, setting.set.bind(setting, !setting.get()), disabled);
     }
   }
 
   _reset() {
     this._deviceOutlineSetting.set(false);
     this._showDeviceScaleFactorSetting.set(false);
     this._showUserAgentTypeSetting.set(false);
     this._showMediaInspectorSetting.set(false);
     this._showRulersSetting.set(false);
-    this._showNetworkConditionsSetting.set(false);
+    this._showThrottlingConditionsSetting.set(false);
     this._model.reset();
   }
 
   /**
    * @param {!Element} element
    * @return {!UI.ToolbarItem}
    */
   _wrapToolbarItem(element) {
     var container = createElement('div');
     var shadowRoot = UI.createShadowRootWithCoreStyles(container, 'emulation/deviceModeToolbar.css');
@@ skipping 94 matching lines @@
   }
 
   _updateDeviceScaleFactorVisibility() {
     this._deviceScaleItem.setVisible(this._showDeviceScaleFactorSetting.get());
   }
 
   _updateUserAgentTypeVisibility() {
     this._uaItem.setVisible(this._showUserAgentTypeSetting.get());
   }
 
-  _updateNetworkConditionsVisibility() {
-    this._networkConditionsItem.setVisible(this._showNetworkConditionsSetting.get());
+  _updateThrottlingVisibility() {
+    this._throttlingConditionsItem.setVisible(this._showThrottlingConditionsSetting.get());
   }
 
   /**
    * @param {!Common.Event} event
    */
   _modeMenuClicked(event) {
     var device = this._model.device();
     var model = this._model;
 
     if (device.modes.length === 2 && device.modes[0].orientation !== device.modes[1].orientation) {
@@ skipping 131 matching lines @@
             this._emulateDevice(device);
             return;
           }
         }
       }
     }
 
     this._model.emulate(Emulation.DeviceModeModel.Type.Responsive, null, null);
   }
 };