summaryrefslogtreecommitdiffstats
path: root/components/onc
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-04-16 12:03:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-16 19:03:40 +0000
commitac04fd8970250987d888f557a328dabc7548941a (patch)
tree3d6ecc358a502c778e7cc1ba5d91160f51a80b89 /components/onc
parentfe4be3daa9f58e38bfc44ef8c692eb59b4db0b29 (diff)
downloadchromium_src-ac04fd8970250987d888f557a328dabc7548941a.zip
chromium_src-ac04fd8970250987d888f557a328dabc7548941a.tar.gz
chromium_src-ac04fd8970250987d888f557a328dabc7548941a.tar.bz2
Use networkingPrivate.startConnect (Take 2)
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. Original CL (reverted for unrelated failure): https://codereview.chromium.org/1043343002/ BUG=430115 TBR=michaelpg, pneubeck, mpearson@chromium.org Review URL: https://codereview.chromium.org/1091043002 Cr-Commit-Position: refs/heads/master@{#325484}
Diffstat (limited to 'components/onc')
-rw-r--r--components/onc/docs/onc_spec.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index 5f001fc..0c2aa63 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>