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

Unified Diff: chromeos/network/network_state.h

Issue 788633003: chromeos networking: move from security to securityclass property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: rebase, resolve conflicts, update new test data (shill_wifi_dhcp.json) Created 5 years, 11 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 | « chromeos/network/network_connection_handler.cc ('k') | chromeos/network/network_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_state.h
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index 1b124e20c6200f2fc9032d3a33213df328470232..403daf7f7a976a7130f3b46e92f3eefc4103aa52 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -52,7 +52,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
// Accessors
bool visible() const { return visible_; }
- const std::string& security() const { return security_; }
+ const std::string& security_class() const { return security_class_; }
const std::string& device_path() const { return device_path_; }
const std::string& guid() const { return guid_; }
const std::string& profile_path() const { return profile_path_; }
@@ -136,7 +136,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
// Network Service properties. Avoid adding any additional properties here.
// Instead use NetworkConfigurationHandler::GetProperties() to asynchronously
// request properties from Shill.
- std::string security_;
+ std::string security_class_;
std::string eap_method_; // Needed for WiFi EAP networks
std::string device_path_;
std::string guid_;
« no previous file with comments | « chromeos/network/network_connection_handler.cc ('k') | chromeos/network/network_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698