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

Unified Diff: chromeos/network/network_connection_handler.cc

Issue 23872021: Use Name not SSID in CopyIdentifyingProperties (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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 | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_connection_handler.cc
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index 3821c8bae17ccce0ded86fad445f70e804dbb1f5..f5f081fa1fdcb1d942435608e329f22c7be3b207 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -452,21 +452,16 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
if (!config_properties.empty()) {
NET_LOG_EVENT("Configuring Network", service_path);
- if (shill_property_util::CopyIdentifyingProperties(service_properties,
- &config_properties)) {
- network_configuration_handler_->SetProperties(
- service_path,
- config_properties,
- base::Bind(&NetworkConnectionHandler::CallShillConnect,
- AsWeakPtr(),
- service_path),
- base::Bind(&NetworkConnectionHandler::HandleConfigurationFailure,
- AsWeakPtr(),
- service_path));
- return;
- }
- NET_LOG_ERROR("Shill dictionary is missing some relevant entries",
- service_path);
+ network_configuration_handler_->SetProperties(
+ service_path,
+ config_properties,
+ base::Bind(&NetworkConnectionHandler::CallShillConnect,
+ AsWeakPtr(),
+ service_path),
+ base::Bind(&NetworkConnectionHandler::HandleConfigurationFailure,
+ AsWeakPtr(),
+ service_path));
+ return;
}
// Otherwise, we probably still need to configure the network since
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698