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

Unified Diff: chrome/browser/chromeos/options/vpn_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/vpn_config_view.cc
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index 8f7fbfac270a9657f88c6cbc2269024e5361f6d7..3dc445a0958c5244971593396a92c813f878f736 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -374,7 +374,8 @@ bool VPNConfigView::Login() {
false);
}
- ash::network_connect::CreateConfigurationAndConnect(&properties, shared);
+ ash::NetworkConnect::Get()->CreateConfigurationAndConnect(&properties,
+ shared);
} else {
const NetworkState* vpn = NetworkHandler::Get()->network_state_handler()->
GetNetworkState(service_path_);
@@ -386,7 +387,7 @@ bool VPNConfigView::Login() {
}
base::DictionaryValue properties;
SetConfigProperties(&properties);
- ash::network_connect::ConfigureNetworkAndConnect(
+ ash::NetworkConnect::Get()->ConfigureNetworkAndConnect(
service_path_, properties, false /* not shared */);
}
return true; // Close dialog.
@@ -999,7 +1000,7 @@ void VPNConfigView::UpdateErrorLabel() {
const NetworkState* vpn = NetworkHandler::Get()->network_state_handler()->
GetNetworkState(service_path_);
if (vpn && vpn->connection_state() == shill::kStateFailure)
- error_msg = ash::network_connect::ErrorString(
+ error_msg = ash::NetworkConnect::Get()->GetErrorString(
vpn->last_error(), vpn->path());
}
if (!error_msg.empty()) {
« no previous file with comments | « chrome/browser/chromeos/mobile/mobile_activator.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698