Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1696)

Unified Diff: Source/devtools/front_end/emulation/EmulatedDevices.js

Issue 1160883011: [DevTools] Remove external device list update. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/emulation/EmulatedDevices.js
diff --git a/Source/devtools/front_end/emulation/EmulatedDevices.js b/Source/devtools/front_end/emulation/EmulatedDevices.js
index 115572f679498aac0e64e2006ce0fce1f922f9f4..d9a992c493e605d8f439b343724887ba8fe21272 100644
--- a/Source/devtools/front_end/emulation/EmulatedDevices.js
+++ b/Source/devtools/front_end/emulation/EmulatedDevices.js
@@ -387,10 +387,6 @@ WebInspector.EmulatedDevice.Images = function()
this._scales = [];
}
-WebInspector.EmulatedDevice.Images.Events = {
- Update: "Update"
-}
-
WebInspector.EmulatedDevice.Images.prototype = {
/**
* @return {*}
@@ -454,23 +450,13 @@ WebInspector.EmulatedDevicesList = function()
this._customSetting = WebInspector.settings.createSetting("customEmulatedDeviceList", []);
/** @type {!Array.<!WebInspector.EmulatedDevice>} */
this._custom = this._listFromJSONV1(this._customSetting.get());
-
- /** @type {!WebInspector.Setting} */
- this._lastUpdatedSetting = WebInspector.settings.createSetting("lastUpdatedDeviceList", null);
-
- /** @type {boolean} */
- this._updating = false;
}
WebInspector.EmulatedDevicesList.Events = {
CustomDevicesUpdated: "CustomDevicesUpdated",
- IsUpdatingChanged: "IsUpdatingChanged",
StandardDevicesUpdated: "StandardDevicesUpdated"
}
-WebInspector.EmulatedDevicesList._DevicesJsonUrl = "https://api.github.com/repos/GoogleChrome/devtools-device-data/contents/devices.json?ref=release";
-WebInspector.EmulatedDevicesList._UpdateIntervalMs = 24 * 60 * 60 * 1000;
-
WebInspector.EmulatedDevicesList.prototype = {
/**
* @param {!Array.<*>} jsonArray
@@ -537,107 +523,6 @@ WebInspector.EmulatedDevicesList.prototype = {
this.dispatchEventToListeners(WebInspector.EmulatedDevicesList.Events.StandardDevicesUpdated);
},
- update: function()
- {
- if (this._updating)
- return;
-
- this._updating = true;
- this.dispatchEventToListeners(WebInspector.EmulatedDevicesList.Events.IsUpdatingChanged);
-
- /**
- * @param {*} json
- * @return {!Promise.<string>}
- */
- function decodeBase64Content(json)
- {
- return loadXHR("data:application/json;charset=utf-8;base64," + json.content);
- }
-
- /**
- * FIXME: promise chain below does not compile with JSON.parse.
- * @return {*}
- */
- function myJsonParse(json)
- {
- return JSON.parse(json);
- }
-
- loadXHR(WebInspector.EmulatedDevicesList._DevicesJsonUrl)
- .then(JSON.parse)
- .then(decodeBase64Content)
- .then(myJsonParse)
- .then(this._parseUpdatedDevices.bind(this))
- .then(this._updateFinished.bind(this))
- .catch(this._updateFailed.bind(this));
- },
-
- maybeAutoUpdate: function()
- {
- if (!Runtime.experiments.isEnabled("externalDeviceList"))
- return;
- var lastUpdated = this._lastUpdatedSetting.get();
- if (lastUpdated && (Date.now() - lastUpdated < WebInspector.EmulatedDevicesList._UpdateIntervalMs))
- return;
- this.update();
- },
-
- /**
- * @param {*} json
- */
- _parseUpdatedDevices: function(json)
- {
- if (!json || typeof json !== "object") {
- WebInspector.console.error("Malfromed device list");
- return;
- }
- if (!("version" in json) || typeof json["version"] !== "number") {
- WebInspector.console.error("Device list does not specify version");
- return;
- }
- var version = json["version"];
- if (version === 1) {
- this._parseDevicesV1(json);
- return;
- }
- WebInspector.console.error("Unsupported device list version '" + version + "'");
- },
-
- /**
- * @param {*} json
- */
- _parseDevicesV1: function(json)
- {
- if (!("devices" in json)) {
- WebInspector.console.error("Malfromed device list");
- return;
- }
- var devices = json["devices"];
- if (!Array.isArray(devices)) {
- WebInspector.console.error("Malfromed device list");
- return;
- }
-
- devices = this._listFromJSONV1(devices);
- this._copyShowValues(this._standard, devices);
- this._standard = devices;
- this.saveStandardDevices();
- WebInspector.console.log("Device list updated successfully");
- },
-
- _updateFailed: function()
- {
- WebInspector.console.error("Cannot update device list");
- this._updateFinished();
- },
-
- _updateFinished: function()
- {
- this._updating = false;
- this._lastUpdatedSetting.set(Date.now());
- this.dispatchEventToListeners(WebInspector.EmulatedDevicesList.Events.IsUpdatingChanged);
- },
-
/**
* @param {!Array.<!WebInspector.EmulatedDevice>} from
* @param {!Array.<!WebInspector.EmulatedDevice>} to
@@ -655,14 +540,6 @@ WebInspector.EmulatedDevicesList.prototype = {
}
},
- /**
- * @return {boolean}
- */
- isUpdating: function()
- {
- return this._updating;
- },
-
__proto__: WebInspector.Object.prototype
}
« no previous file with comments | « Source/devtools/front_end/emulation/DevicesSettingsTab.js ('k') | Source/devtools/front_end/emulation/OverridesUI.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698