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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 673713003: Create a NetworkConnect class and Delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More virtual fixes Created 6 years, 2 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: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 77610b96cb3c0617b6c2f3491c426a9f8976561f..40df94b4dbbd788d945bb58beee524f182afc924 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -588,7 +588,7 @@ void WifiConfigView::UpdateErrorLabel() {
if (error_msg.empty() && !service_path_.empty()) {
const NetworkState* network = GetNetworkState();
if (network && network->connection_state() == shill::kStateFailure) {
- error_msg = ash::network_connect::ErrorString(
+ error_msg = ash::NetworkConnect::Get()->GetErrorString(
network->last_error(), network->path());
}
}
@@ -705,8 +705,8 @@ bool WifiConfigView::Login() {
shill::kSecurityProperty, security);
// Configure and connect to network.
- ash::network_connect::CreateConfigurationAndConnect(&properties,
- share_network);
+ ash::NetworkConnect::Get()->CreateConfigurationAndConnect(&properties,
+ share_network);
} else {
if (!network) {
// Shill no longer knows about this network (edge case).
@@ -732,9 +732,10 @@ bool WifiConfigView::Login() {
properties.SetStringWithoutPathExpansion(shill::kTypeProperty,
shill::kTypeEthernetEap);
share_network = false;
- ash::network_connect::CreateConfiguration(&properties, share_network);
+ ash::NetworkConnect::Get()->CreateConfiguration(&properties,
+ share_network);
} else {
- ash::network_connect::ConfigureNetworkAndConnect(
+ ash::NetworkConnect::Get()->ConfigureNetworkAndConnect(
service_path_, properties, share_network);
}
}
« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.cc ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698