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

Unified Diff: chrome/browser/resources/options/chromeos/onc_data.js

Issue 570503002: Compile chrome://settings, part 6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@H_options_errors_4
Patch Set: fix asserts, rebase Created 6 years, 3 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: chrome/browser/resources/options/chromeos/onc_data.js
diff --git a/chrome/browser/resources/options/chromeos/onc_data.js b/chrome/browser/resources/options/chromeos/onc_data.js
index 5a45e6ab15c6a4643990419341ccccdd83a881e6..cc70fd00fc25ab82677b0f75c956a39f64dc43d1 100644
--- a/chrome/browser/resources/options/chromeos/onc_data.js
+++ b/chrome/browser/resources/options/chromeos/onc_data.js
@@ -7,6 +7,14 @@
* ONC managed or unmanaged dictionaries. Supports nested dictionaries,
* e.g. data.getManagedProperty('VPN.Type').
*/
+
+cr.exportPath('cr.onc');
+
+/**
+ * @typedef {(Object|Array|string|undefined)}
+ */
+cr.onc.OncValue;
+
cr.define('cr.onc', function() {
'use strict';
@@ -22,8 +30,8 @@ cr.define('cr.onc', function() {
/**
* Returns either a managed property dictionary or an unmanaged value.
* @param {string} key The property key.
- * @return {*} The property value or dictionary if it exists, otherwise
- * undefined.
+ * @return {cr.onc.OncValue} The property value or dictionary if it exists,
+ * otherwise undefined.
*/
getManagedProperty: function(key) {
var data = this.data_;
@@ -44,7 +52,7 @@ cr.define('cr.onc', function() {
* Sets the value of a property. Currently only supports unmanaged
* properties.
* @param {string} key The property key.
- * @param {string} value The property value to set.
+ * @param {Object} value The property value to set.
*/
setManagedProperty: function(key, value) {
var data = this.data_;
@@ -76,7 +84,7 @@ cr.define('cr.onc', function() {
/**
* Gets the active value of a property.
* @param {string} key The property key.
- * @return {*} The property value or undefined.
+ * @return {cr.onc.OncValue} The property value or undefined.
*/
getActiveValue: function(key) {
var property = this.getManagedProperty(key);
@@ -86,7 +94,8 @@ cr.define('cr.onc', function() {
if ('Active' in property)
return property['Active'];
// If no Active value is defined, return the effective value if present.
- var effective = this.getEffectiveValueFromProperty_(property);
+ var effective = this.getEffectiveValueFromProperty_(
+ /** @type {Object} */(property));
if (effective != undefined)
return effective;
// Otherwise this is an Object but not a Managed one.
@@ -97,7 +106,8 @@ cr.define('cr.onc', function() {
* Gets the translated ONC value from the result of getActiveValue() using
* loadTimeData. If no translation exists, returns the untranslated value.
* @param {string} key The property key.
- * @return {*} The translation if available or the value if not.
+ * @return {cr.onc.OncValue} The translation if available or the value if
+ * not.
*/
getTranslatedValue: function(key) {
var value = this.getActiveValue(key);
@@ -121,7 +131,7 @@ cr.define('cr.onc', function() {
/**
* Gets the recommended value of a property.
* @param {string} key The property key.
- * @return {*} The property value or undefined.
+ * @return {cr.onc.OncValue} The property value or undefined.
*/
getRecommendedValue: function(key) {
var property = this.getManagedProperty(key);
@@ -161,7 +171,7 @@ cr.define('cr.onc', function() {
/**
* Get the effective value from a Managed property ONC dictionary.
* @param {Object} property The managed property ONC dictionary.
- * @return {*} The effective value or undefined.
+ * @return {cr.onc.OncValue} The effective value or undefined.
* @private
*/
getEffectiveValueFromProperty_: function(property) {

Powered by Google App Engine
This is Rietveld 408576698