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

Unified Diff: chromeos/network/network_profile_handler.cc

Issue 24348002: Migrate DBus service constants from flimflam namespace to shill namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased to ToT 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 | « chromeos/network/network_device_handler_unittest.cc ('k') | chromeos/network/network_sms_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_profile_handler.cc
diff --git a/chromeos/network/network_profile_handler.cc b/chromeos/network/network_profile_handler.cc
index 26b1bef8055113d04cdd88326fb51d410f471320..19a47b690c7c0649f179f0aa767b0152bf1432fb 100644
--- a/chromeos/network/network_profile_handler.cc
+++ b/chromeos/network/network_profile_handler.cc
@@ -75,18 +75,18 @@ void NetworkProfileHandler::GetManagerPropertiesCallback(
}
const base::Value* profiles = NULL;
- properties.GetWithoutPathExpansion(flimflam::kProfilesProperty, &profiles);
+ properties.GetWithoutPathExpansion(shill::kProfilesProperty, &profiles);
if (!profiles) {
LOG(ERROR) << "Manager properties returned from Shill don't contain "
- << "the field " << flimflam::kProfilesProperty;
+ << "the field " << shill::kProfilesProperty;
return;
}
- OnPropertyChanged(flimflam::kProfilesProperty, *profiles);
+ OnPropertyChanged(shill::kProfilesProperty, *profiles);
}
void NetworkProfileHandler::OnPropertyChanged(const std::string& name,
const base::Value& value) {
- if (name != flimflam::kProfilesProperty)
+ if (name != shill::kProfilesProperty)
return;
const base::ListValue* profiles_value = NULL;
@@ -141,8 +141,7 @@ void NetworkProfileHandler::GetProfilePropertiesCallback(
const std::string& profile_path,
const base::DictionaryValue& properties) {
std::string userhash;
- properties.GetStringWithoutPathExpansion(shill::kUserHashProperty,
- &userhash);
+ properties.GetStringWithoutPathExpansion(shill::kUserHashProperty, &userhash);
AddProfile(NetworkProfile(profile_path, userhash));
}
« no previous file with comments | « chromeos/network/network_device_handler_unittest.cc ('k') | chromeos/network/network_sms_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698