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

Unified Diff: ui/chromeos/network/network_connect.cc

Issue 1272003002: Allow networkingPrivate to request configure UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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
Index: ui/chromeos/network/network_connect.cc
diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc
index e492f1273ca5cea7ba6318cf6c4dd34c2f25f167..f29e4c97e4a560d0b515e3812dc09e3c4a5300ce 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -63,6 +63,8 @@ class NetworkConnectImpl : public NetworkConnect {
// NetworkConnect
void ConnectToNetwork(const std::string& service_path) override;
+ bool HandleConnectFailed(const std::string& service_path,
+ const std::string& error_name) override;
void SetTechnologyEnabled(const chromeos::NetworkTypePattern& technology,
bool enabled_state) override;
void ActivateCellular(const std::string& service_path) override;
@@ -83,6 +85,8 @@ class NetworkConnectImpl : public NetworkConnect {
void OnConnectFailed(const std::string& service_path,
const std::string& error_name,
scoped_ptr<base::DictionaryValue> error_data);
+ bool HandleConnectFailedImpl(const std::string& service_path,
+ const std::string& error_name);
bool GetNetworkProfilePath(bool shared, std::string* profile_path);
void OnConnectSucceeded(const std::string& service_path);
void CallConnectToNetwork(const std::string& service_path,
@@ -198,13 +202,19 @@ bool NetworkConnectImpl::GetNetworkProfilePath(bool shared,
return true;
}
-// This handles connect failures that are a direct result of a user initiated
-// connect request and result in a new UI being shown. Note: notifications are
-// handled by NetworkStateNotifier.
void NetworkConnectImpl::OnConnectFailed(
const std::string& service_path,
const std::string& error_name,
scoped_ptr<base::DictionaryValue> error_data) {
+ HandleConnectFailedImpl(service_path, error_name);
+}
+
+// This handles connect failures that are a direct result of a user initiated
+// connect request and result in a new UI being shown. Note: notifications are
+// handled by NetworkStateNotifier.
+bool NetworkConnectImpl::HandleConnectFailedImpl(
+ const std::string& service_path,
+ const std::string& error_name) {
NET_LOG_ERROR("Connect Failed: " + error_name, service_path);
if (error_name == NetworkConnectionHandler::kErrorBadPassphrase ||
@@ -212,23 +222,26 @@ void NetworkConnectImpl::OnConnectFailed(
error_name == NetworkConnectionHandler::kErrorConfigurationRequired ||
error_name == NetworkConnectionHandler::kErrorAuthenticationRequired) {
HandleUnconfiguredNetwork(service_path);
- return;
+ return true;
}
if (error_name == NetworkConnectionHandler::kErrorCertificateRequired) {
if (!delegate_->ShowEnrollNetwork(service_path))
HandleUnconfiguredNetwork(service_path);
- return;
+ return true;
}
// Only show a configure dialog if there was a ConnectFailed error. The dialog
// allows the user to request a new connect attempt or cancel. Note: a
// notification may also be displayed by NetworkStateNotifier in this case.
- if (error_name == NetworkConnectionHandler::kErrorConnectFailed)
+ if (error_name == NetworkConnectionHandler::kErrorConnectFailed) {
HandleUnconfiguredNetwork(service_path);
+ return true;
+ }
// Notifications for other connect failures are handled by
// NetworkStateNotifier, so no need to do anything else here.
+ return false;
}
void NetworkConnectImpl::OnConnectSucceeded(const std::string& service_path) {
@@ -377,6 +390,11 @@ void NetworkConnectImpl::ConnectToNetwork(const std::string& service_path) {
CallConnectToNetwork(service_path, check_error_state);
}
+bool NetworkConnectImpl::HandleConnectFailed(const std::string& service_path,
+ const std::string& error_name) {
+ return HandleConnectFailedImpl(service_path, error_name);
+}
+
void NetworkConnectImpl::SetTechnologyEnabled(
const NetworkTypePattern& technology,
bool enabled_state) {

Powered by Google App Engine
This is Rietveld 408576698