diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-04-16 12:03:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-16 19:03:40 +0000 |
| commit | ac04fd8970250987d888f557a328dabc7548941a (patch) | |
| tree | 3d6ecc358a502c778e7cc1ba5d91160f51a80b89 /chromeos/network/network_state_handler.h | |
| parent | fe4be3daa9f58e38bfc44ef8c692eb59b4db0b29 (diff) | |
| download | chromium_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 'chromeos/network/network_state_handler.h')
| -rw-r--r-- | chromeos/network/network_state_handler.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h index 135d225..f032f77 100644 --- a/chromeos/network/network_state_handler.h +++ b/chromeos/network/network_state_handler.h @@ -224,6 +224,10 @@ class CHROMEOS_EXPORT NetworkStateHandler return default_network_path_; } + // Sets the |last_error_| property of the matching NetworkState for tests. + void SetLastErrorForTest(const std::string& service_path, + const std::string& error); + // Constructs and initializes an instance for testing. static NetworkStateHandler* InitializeForTest(); |