summaryrefslogtreecommitdiffstats
path: root/components/onc
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-04-14 12:49:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-14 19:50:54 +0000
commite22e5bcbad2cea941993b32e6cc3b082822a42fc (patch)
tree4b769cf0ca87ecdc6f2a30b18a54559940269893 /components/onc
parente6a653183ba2a1c4f24990904dfc78e32c975f5b (diff)
downloadchromium_src-e22e5bcbad2cea941993b32e6cc3b082822a42fc.zip
chromium_src-e22e5bcbad2cea941993b32e6cc3b082822a42fc.tar.gz
chromium_src-e22e5bcbad2cea941993b32e6cc3b082822a42fc.tar.bz2
Use networkingPrivate.startConnect
This adds checks for unconfigured or non-activated networks to internet_details.js since it no longer uses the checks in network_connect.cc. It also moves some notification handling from network_connect.cc to network_state_notifier.cc so that it does not rely on network_connect.cc. BUG=430115 Review URL: https://codereview.chromium.org/1043343002 Cr-Commit-Position: refs/heads/master@{#325108}
Diffstat (limited to 'components/onc')
-rw-r--r--components/onc/docs/onc_spec.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index 5f001fc..e0fcb48 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -456,10 +456,10 @@
(optional, read-only)
<span class="type">string</span>
</span>
- The current error state for this network. Error states are provided by
- the system and are not explicitly defined here. They may or may not be
- human-readable. This field will be empty or absent if the network is not
- in an error state.
+ The current error state for this network, if any. Error states are
+ provided by the system and are not explicitly defined here. They may or
+ may not be human-readable. This field will be empty or absent if the
+ network is not in an error state.
</dd>
<dt class="field">MacAddress</dt>
@@ -720,7 +720,10 @@
</span>
Describes the passphrase for WEP/WPA/WPA2
connections. If <span class="value">WEP-PSK</span> is used, the passphrase
- must be of the format 0x&lt;hex-number&gt;, where &lt;hex-number&gt; is
+ must be of the format 0x&lt;
+hex - number& gt;
+, where& lt;
+hex - number& gt; is
40, 104, 128, or 232 bits.
</dd>