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

Unified Diff: chromeos/network/network_connect.cc

Issue 2775663005: Adds NetworkConnect::ConnectToNetworkId(), uses it in detailed VPN page (Closed)
Patch Set: Adds NetworkConnect::ConnectToNetworkId(), uses it in detailed VPN page (nits) Created 3 years, 9 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
« no previous file with comments | « chromeos/network/network_connect.h ('k') | chromeos/network/network_connect_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_connect.cc
diff --git a/chromeos/network/network_connect.cc b/chromeos/network/network_connect.cc
index bf6ed2ed137ece4d76d2547afd01db26862c3d47..ee0186778a13e1fd50595936d69948edba7718c6 100644
--- a/chromeos/network/network_connect.cc
+++ b/chromeos/network/network_connect.cc
@@ -26,6 +26,9 @@ namespace chromeos {
namespace {
+void IgnoreDisconnectError(const std::string& error_name,
+ std::unique_ptr<base::DictionaryValue> error_data) {}
+
// Returns true for carriers that can be activated through Shill instead of
// through a WebUI dialog.
bool IsDirectActivatedCarrier(const std::string& carrier) {
@@ -48,6 +51,7 @@ class NetworkConnectImpl : public NetworkConnect {
// NetworkConnect
void ConnectToNetworkId(const std::string& network_id) override;
+ void DisconnectFromNetworkId(const std::string& network_id) override;
bool MaybeShowConfigureUI(const std::string& network_id,
const std::string& connect_error) override;
void SetTechnologyEnabled(const NetworkTypePattern& technology,
@@ -402,6 +406,17 @@ void NetworkConnectImpl::ConnectToNetworkId(const std::string& network_id) {
CallConnectToNetwork(network_id, check_error_state);
}
+void NetworkConnectImpl::DisconnectFromNetworkId(
+ const std::string& network_id) {
+ NET_LOG_USER("DisconnectFromNetwork", network_id);
+ const NetworkState* network = GetNetworkStateFromId(network_id);
+ if (!network)
+ return;
+ NetworkHandler::Get()->network_connection_handler()->DisconnectNetwork(
+ network->path(), base::Bind(&base::DoNothing),
+ base::Bind(&IgnoreDisconnectError));
+}
+
bool NetworkConnectImpl::MaybeShowConfigureUI(
const std::string& network_id,
const std::string& connect_error) {
« no previous file with comments | « chromeos/network/network_connect.h ('k') | chromeos/network/network_connect_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698