DevTools: extract NetworkConditionsSelector into its own module

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

Index: third_party/WebKit/Source/devtools/front_end/network_conditions/NetworkConditionsSelector.js
diff --git a/third_party/WebKit/Source/devtools/front_end/components/NetworkConditionsSelector.js b/third_party/WebKit/Source/devtools/front_end/network_conditions/NetworkConditionsSelector.js
similarity index 87%
rename from third_party/WebKit/Source/devtools/front_end/components/NetworkConditionsSelector.js
rename to third_party/WebKit/Source/devtools/front_end/network_conditions/NetworkConditionsSelector.js
index 030c044df7f16a140f64d9ccfe70f4449e5aa7b8..1cd152d3b6148b40d59368557dfbd451f97543bb 100644
--- a/third_party/WebKit/Source/devtools/front_end/components/NetworkConditionsSelector.js
+++ b/third_party/WebKit/Source/devtools/front_end/network_conditions/NetworkConditionsSelector.js
@@ -4,9 +4,9 @@
 /**
  * @unrestricted
  */
-Components.NetworkConditionsSelector = class {
+NetworkConditions.NetworkConditionsSelector = class {
   /**
-   * @param {function(!Array<!Components.NetworkConditionsGroup>):!Array<?SDK.NetworkManager.Conditions>} populateCallback
+   * @param {function(!Array<!NetworkConditions.NetworkConditionsGroup>):!Array<?SDK.NetworkManager.Conditions>} populateCallback
    * @param {function(number)} selectCallback
    */
   constructor(populateCallback, selectCallback) {
@@ -50,8 +50,8 @@ Components.NetworkConditionsSelector = class {
     if (!isThrottling)
       return {text: conditionTitle, title: conditionTitle};
 
-    var downloadText = Components.NetworkConditionsSelector._throughputText(conditions.download, plainText);
-    var uploadText = Components.NetworkConditionsSelector._throughputText(conditions.upload, plainText);
+    var downloadText = NetworkConditions.NetworkConditionsSelector._throughputText(conditions.download, plainText);
+    var uploadText = NetworkConditions.NetworkConditionsSelector._throughputText(conditions.upload, plainText);
     var pattern = plainText ? '%s (%dms, %s, %s)' : '%s (%dms RTT, %s\u2b07, %s\u2b06)';
     var title = Common.UIString(pattern, conditionTitle, conditions.latency, downloadText, uploadText);
     return {
@@ -67,11 +67,11 @@ Components.NetworkConditionsSelector = class {
    */
   static decorateSelect(selectElement) {
     var options = [];
-    var selector = new Components.NetworkConditionsSelector(populate, select);
+    var selector = new NetworkConditions.NetworkConditionsSelector(populate, select);
     selectElement.addEventListener('change', optionSelected, false);
 
     /**
-     * @param {!Array.<!Components.NetworkConditionsGroup>} groups
+     * @param {!Array.<!NetworkConditions.NetworkConditionsGroup>} groups
      * @return {!Array<?SDK.NetworkManager.Conditions>}
      */
     function populate(groups) {
@@ -82,7 +82,7 @@ Components.NetworkConditionsSelector = class {
         var groupElement = selectElement.createChild('optgroup');
         groupElement.label = group.title;
         for (var conditions of group.items) {
-          var title = Components.NetworkConditionsSelector._conditionsTitle(conditions, true);
+          var title = NetworkConditions.NetworkConditionsSelector._conditionsTitle(conditions, true);
           var option = new Option(title.text, title.text);
           option.title = title.title;
           groupElement.appendChild(option);
@@ -123,7 +123,7 @@ Components.NetworkConditionsSelector = class {
     /** @type {!Array<?SDK.NetworkManager.Conditions>} */
     var options = [];
     var selectedIndex = -1;
-    var selector = new Components.NetworkConditionsSelector(populate, select);
+    var selector = new NetworkConditions.NetworkConditionsSelector(populate, select);
     return button;
 
     /**
@@ -136,7 +136,7 @@ Components.NetworkConditionsSelector = class {
           contextMenu.appendSeparator();
         } else {
           contextMenu.appendCheckboxItem(
-              Components.NetworkConditionsSelector._conditionsTitle(conditions, true).text,
+              NetworkConditions.NetworkConditionsSelector._conditionsTitle(conditions, true).text,
               selector.optionSelected.bind(selector, conditions), selectedIndex === index);
         }
       }
@@ -144,7 +144,7 @@ Components.NetworkConditionsSelector = class {
     }
 
     /**
-     * @param {!Array.<!Components.NetworkConditionsGroup>} groups
+     * @param {!Array.<!NetworkConditions.NetworkConditionsGroup>} groups
      * @return {!Array<?SDK.NetworkManager.Conditions>}
      */
     function populate(groups) {
@@ -198,7 +198,7 @@ Components.NetworkConditionsSelector = class {
 
   _populateOptions() {
     var customGroup = {title: Common.UIString('Custom'), items: this._customSetting.get()};
-    var presetsGroup = {title: Common.UIString('Presets'), items: Components.NetworkConditionsSelector._presets};
+    var presetsGroup = {title: Common.UIString('Presets'), items: NetworkConditions.NetworkConditionsSelector._presets};
     var disabledGroup = {title: Common.UIString('Disabled'), items: [SDK.NetworkManager.NoThrottlingConditions]};
     this._options = this._populateCallback([disabledGroup, presetsGroup, customGroup]);
     if (!this._conditionsChanged()) {
@@ -241,11 +241,11 @@ Components.NetworkConditionsSelector = class {
 };
 
 /** @typedef {!{title: string, items: !Array<!SDK.NetworkManager.Conditions>}} */
-Components.NetworkConditionsGroup;
+NetworkConditions.NetworkConditionsGroup;
 
 
 /** @type {!Array.<!SDK.NetworkManager.Conditions>} */
-Components.NetworkConditionsSelector._presets = [
+NetworkConditions.NetworkConditionsSelector._presets = [
   SDK.NetworkManager.OfflineConditions, {title: 'GPRS', download: 50 * 1024 / 8, upload: 20 * 1024 / 8, latency: 500},
   {title: 'Regular 2G', download: 250 * 1024 / 8, upload: 50 * 1024 / 8, latency: 300},
   {title: 'Good 2G', download: 450 * 1024 / 8, upload: 150 * 1024 / 8, latency: 150},
@@ -261,10 +261,10 @@ Components.NetworkConditionsSelector._presets = [
  * @implements {UI.ListWidget.Delegate}
  * @unrestricted
  */
-Components.NetworkConditionsSettingsTab = class extends UI.VBox {
+NetworkConditions.NetworkConditionsSettingsTab = class extends UI.VBox {

[dgozman, 2017/02/02 04:04:04]

Let's split this out into separate file now?

[chenwilliam, 2017/02/02 22:26:55]

Done.

   constructor() {
     super(true);
-    this.registerRequiredCSS('components/networkConditionsSettingsTab.css');
+    this.registerRequiredCSS('network_conditions/networkConditionsSettingsTab.css');
 
     this.contentElement.createChild('div', 'header').textContent = Common.UIString('Network Throttling Profiles');
 
@@ -274,7 +274,7 @@ Components.NetworkConditionsSettingsTab = class extends UI.VBox {
 
     this._list = new UI.ListWidget(this);
     this._list.element.classList.add('conditions-list');
-    this._list.registerRequiredCSS('components/networkConditionsSettingsTab.css');
+    this._list.registerRequiredCSS('network_conditions/networkConditionsSettingsTab.css');
     this._list.show(this.contentElement);
 
     this._customSetting = Common.moduleSetting('customNetworkConditions');
@@ -301,7 +301,7 @@ Components.NetworkConditionsSettingsTab = class extends UI.VBox {
 
     this._list.appendSeparator();
 
-    conditions = Components.NetworkConditionsSelector._presets;
+    conditions = NetworkConditions.NetworkConditionsSelector._presets;
     for (var i = 0; i < conditions.length; ++i)
       this._list.appendItem(conditions[i], false);
   }
@@ -325,10 +325,10 @@ Components.NetworkConditionsSettingsTab = class extends UI.VBox {
     titleText.title = conditions.title;
     element.createChild('div', 'conditions-list-separator');
     element.createChild('div', 'conditions-list-text').textContent =
-        Components.NetworkConditionsSelector._throughputText(conditions.download);
+        NetworkConditions.NetworkConditionsSelector._throughputText(conditions.download);
     element.createChild('div', 'conditions-list-separator');
     element.createChild('div', 'conditions-list-text').textContent =
-        Components.NetworkConditionsSelector._throughputText(conditions.upload);
+        NetworkConditions.NetworkConditionsSelector._throughputText(conditions.upload);
     element.createChild('div', 'conditions-list-separator');
     element.createChild('div', 'conditions-list-text').textContent = Common.UIString('%dms', conditions.latency);
     return element;
@@ -463,7 +463,7 @@ Components.NetworkConditionsSettingsTab = class extends UI.VBox {
  * @implements {UI.ActionDelegate}
  * @unrestricted
  */
-Components.NetworkConditionsActionDelegate = class {
+NetworkConditions.NetworkConditionsActionDelegate = class {
   /**
    * @override
    * @param {!UI.Context} context
@@ -487,8 +487,8 @@ Components.NetworkConditionsActionDelegate = class {
  * @param {!Protocol.Network.ResourcePriority} priority
  * @return {string}
  */
-Components.uiLabelForPriority = function(priority) {
-  var map = Components.priorityUiLabelMap();
+NetworkConditions.uiLabelForPriority = function(priority) {

[dgozman, 2017/02/02 04:04:04]

And this into NetworkPriorities.js?

[chenwilliam, 2017/02/02 22:26:55]

Done.

+  var map = NetworkConditions.priorityUiLabelMap();
   return map.get(priority) || '';
 };
 
@@ -496,25 +496,25 @@ Components.uiLabelForPriority = function(priority) {
  * @param {string} priorityLabel
  * @return {string}
  */
-Components.uiLabelToPriority = function(priorityLabel) {
+NetworkConditions.uiLabelToPriority = function(priorityLabel) {
   /** @type {!Map<string, !Protocol.Network.ResourcePriority>} */
-  var labelToPriorityMap = Components.uiLabelToPriority._uiLabelToPriorityMap;
+  var labelToPriorityMap = NetworkConditions.uiLabelToPriority._uiLabelToPriorityMap;
 
   if (labelToPriorityMap)
     return labelToPriorityMap.get(priorityLabel);
 
   labelToPriorityMap = new Map();
-  Components.priorityUiLabelMap().forEach((value, key) => labelToPriorityMap.set(value, key));
-  Components.uiLabelToPriority._uiLabelToPriorityMap = labelToPriorityMap;
+  NetworkConditions.priorityUiLabelMap().forEach((value, key) => labelToPriorityMap.set(value, key));
+  NetworkConditions.uiLabelToPriority._uiLabelToPriorityMap = labelToPriorityMap;
   return labelToPriorityMap.get(priorityLabel) || '';
 };
 
 /**
  * @return {!Map<!Protocol.Network.ResourcePriority, string>}
  */
-Components.priorityUiLabelMap = function() {
+NetworkConditions.priorityUiLabelMap = function() {
   /** @type {!Map<!Protocol.Network.ResourcePriority, string>} */
-  var map = Components.priorityUiLabelMap._priorityUiLabelMap;
+  var map = NetworkConditions.priorityUiLabelMap._priorityUiLabelMap;
 
   if (map)
     return map;
@@ -525,7 +525,7 @@ Components.priorityUiLabelMap = function() {
   map.set(Protocol.Network.ResourcePriority.Medium, Common.UIString('Medium'));
   map.set(Protocol.Network.ResourcePriority.High, Common.UIString('High'));
   map.set(Protocol.Network.ResourcePriority.VeryHigh, Common.UIString('Highest'));
-  Components.priorityUiLabelMap._priorityUiLabelMap = map;
+  NetworkConditions.priorityUiLabelMap._priorityUiLabelMap = map;
 
   return map;
 };
@@ -533,9 +533,9 @@ Components.priorityUiLabelMap = function() {
 /**
  * @return {!Map<!Protocol.Network.ResourcePriority, number>}
  */
-Components.prioritySymbolToNumericMap = function() {
+NetworkConditions.prioritySymbolToNumericMap = function() {
   /** @type {!Map<!Protocol.Network.ResourcePriority, number>} */
-  var priorityMap = Components.prioritySymbolToNumericMap._symbolicToNumericPriorityMap;
+  var priorityMap = NetworkConditions.prioritySymbolToNumericMap._symbolicToNumericPriorityMap;
 
   if (priorityMap)
     return priorityMap;
@@ -546,7 +546,7 @@ Components.prioritySymbolToNumericMap = function() {
   priorityMap.set(Protocol.Network.ResourcePriority.Medium, 3);
   priorityMap.set(Protocol.Network.ResourcePriority.High, 4);
   priorityMap.set(Protocol.Network.ResourcePriority.VeryHigh, 5);
-  Components.prioritySymbolToNumericMap._symbolicToNumericPriorityMap = priorityMap;
+  NetworkConditions.prioritySymbolToNumericMap._symbolicToNumericPriorityMap = priorityMap;
 
   return priorityMap;
 };