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

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

Issue 686503002: Move network_connect code to ui/chromeos/network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 40df94b4dbbd788d945bb58beee524f182afc924..f40a1586024734ff73ef9a8bc644ed3dd997e90c 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/chromeos/options/wifi_config_view.h"
-#include "ash/system/chromeos/network/network_connect.h"
#include "base/bind.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -28,6 +27,7 @@
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/chromeos/network/network_connect.h"
#include "ui/events/event.h"
#include "ui/views/controls/button/checkbox.h"
#include "ui/views/controls/button/image_button.h"
@@ -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::NetworkConnect::Get()->GetErrorString(
+ error_msg = ui::NetworkConnect::Get()->GetErrorString(
network->last_error(), network->path());
}
}
@@ -705,8 +705,8 @@ bool WifiConfigView::Login() {
shill::kSecurityProperty, security);
// Configure and connect to network.
- ash::NetworkConnect::Get()->CreateConfigurationAndConnect(&properties,
- share_network);
+ ui::NetworkConnect::Get()->CreateConfigurationAndConnect(&properties,
+ share_network);
} else {
if (!network) {
// Shill no longer knows about this network (edge case).
@@ -732,10 +732,10 @@ bool WifiConfigView::Login() {
properties.SetStringWithoutPathExpansion(shill::kTypeProperty,
shill::kTypeEthernetEap);
share_network = false;
- ash::NetworkConnect::Get()->CreateConfiguration(&properties,
- share_network);
+ ui::NetworkConnect::Get()->CreateConfiguration(&properties,
+ share_network);
} else {
- ash::NetworkConnect::Get()->ConfigureNetworkAndConnect(
+ ui::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