summaryrefslogtreecommitdiff
path: root/chromium/components/onc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/components/onc')
-rw-r--r--chromium/components/onc/docs/onc_spec.md26
-rw-r--r--chromium/components/onc/onc_constants.cc1
-rw-r--r--chromium/components/onc/onc_constants.h1
3 files changed, 18 insertions, 10 deletions
diff --git a/chromium/components/onc/docs/onc_spec.md b/chromium/components/onc/docs/onc_spec.md
index 5ee8ae39a58..abad03ea4fd 100644
--- a/chromium/components/onc/docs/onc_spec.md
+++ b/chromium/components/onc/docs/onc_spec.md
@@ -191,11 +191,13 @@ warns admins of the implications of mis-using this policy for Chrome OS.
* **DisableNetworkTypes**
* (optional) - **array of string**
* Allowed values are:
- * Cellular
- * Ethernet
- * WiFi
- * Tether
+ * *Cellular*
+ * *Ethernet*
+ * *WiFi*
+ * *Tether*
+ * *VPN*
* List of strings containing disabled network interfaces.
+ * Adding *VPN* to the list will only disable Chrome OS built-in VPN.
## Network Configuration
@@ -222,8 +224,14 @@ Field **NetworkConfigurations** is an array of
* *DHCP*
* *Static*
* Determines whether the IP Address configuration is statically configured,
- see **StaticIPConfig**, or automatically configured
- using DHCP.
+ see **StaticIPConfig**, or automatically configured using DHCP.
+
+* **Metered**
+ * (optional, defaults to "false") - **boolean**
+ * Whether the network should be considered metered. This may affect auto
+ update frequency, and may be used as a hint for apps to conserve data.
+ When not specified, the system will set this to the detected value.
+ See also **WiFi.TetheringState**.
* **NameServersConfigType**
* (optional if **Remove** is *false*, otherwise ignored. Defaults to *DHCP*
@@ -232,8 +240,7 @@ Field **NetworkConfigurations** is an array of
* *DHCP*
* *Static*
* Determines whether the NameServers configuration is statically configured,
- see **StaticIPConfig**, or automatically configured
- using DHCP.
+ see **StaticIPConfig**, or automatically configured using DHCP.
* **IPConfigs**
* (optional for connected networks, read-only) -
@@ -520,8 +527,7 @@ field **WiFi** must be set to an object of type [WiFi](#WiFi-type).
* (optional, read-only, defaults to "NotDetected") - **string**
* The tethering state of the WiFi connection. If the connection is
tethered the value is "Confirmed". If the connection is suspected to be
- tethered the value is "Suspected". In all other cases it's
- "NotDetected".
+ tethered the value is "Suspected". In all other cases it's "NotDetected".
---
* At least one of the fields **HexSSID** or **SSID** must be present.
diff --git a/chromium/components/onc/onc_constants.cc b/chromium/components/onc/onc_constants.cc
index 1cff6252612..bd352a788c7 100644
--- a/chromium/components/onc/onc_constants.cc
+++ b/chromium/components/onc/onc_constants.cc
@@ -46,6 +46,7 @@ const char kIPConfigs[] = "IPConfigs";
const char kIPConfigTypeDHCP[] = "DHCP";
const char kIPConfigTypeStatic[] = "Static";
const char kMacAddress[] = "MacAddress";
+const char kMetered[] = "Metered";
const char kNameServersConfigType[] = "NameServersConfigType";
const char kName[] = "Name";
const char kPriority[] = "Priority";
diff --git a/chromium/components/onc/onc_constants.h b/chromium/components/onc/onc_constants.h
index 849e6248a4c..34afea41184 100644
--- a/chromium/components/onc/onc_constants.h
+++ b/chromium/components/onc/onc_constants.h
@@ -68,6 +68,7 @@ ONC_EXPORT extern const char kIPConfigTypeStatic[];
ONC_EXPORT extern const char kSavedIPConfig[];
ONC_EXPORT extern const char kStaticIPConfig[];
ONC_EXPORT extern const char kMacAddress[];
+ONC_EXPORT extern const char kMetered[];
ONC_EXPORT extern const char kNameServersConfigType[];
ONC_EXPORT extern const char kName[];
ONC_EXPORT extern const char kPriority[];