summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/shill_manager_client.cc
diff options
context:
space:
mode:
authorbenchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 07:02:28 +0000
committerbenchan@chromium.org <benchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 07:02:28 +0000
commitd9766a6b680026983287e66670f5ef2e8006bc8d (patch)
tree9d782775dbfb805e719f441a1eef82793903fb0f /chromeos/dbus/shill_manager_client.cc
parentfe2a870e7930404fd8525ddeedea0bcfb434c9bd (diff)
downloadchromium_src-d9766a6b680026983287e66670f5ef2e8006bc8d.zip
chromium_src-d9766a6b680026983287e66670f5ef2e8006bc8d.tar.gz
chromium_src-d9766a6b680026983287e66670f5ef2e8006bc8d.tar.bz2
Migrate DBus service constants from flimflam namespace to shill namespace.
All shill DBus service constants have been moved from the flimflam namespace to the shill namespace. This CL makes the corresponding changes on the Chrome side. Related CLs: https://chromium-review.googlesource.com/#/c/170123/ https://chromium-review.googlesource.com/#/c/170205/ https://chromium-review.googlesource.com/#/c/170206/ https://chromium-review.googlesource.com/#/c/170207/ https://chromium-review.googlesource.com/#/c/170208/ https://chromium-review.googlesource.com/#/c/170209/ https://chromium-review.googlesource.com/#/c/170223/ https://chromium-review.googlesource.com/#/c/170230/ https://chromium-review.googlesource.com/#/c/170231/ BUG=295425 R=stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/24286008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_manager_client.cc')
-rw-r--r--chromeos/dbus/shill_manager_client.cc47
1 files changed, 23 insertions, 24 deletions
diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc
index 70f2095..f3cd1bb 100644
--- a/chromeos/dbus/shill_manager_client.cc
+++ b/chromeos/dbus/shill_manager_client.cc
@@ -39,14 +39,14 @@ class ShillManagerClientImpl : public ShillManagerClient {
}
virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kGetPropertiesFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kGetPropertiesFunction);
helper_->CallDictionaryValueMethod(&method_call, callback);
}
virtual void GetNetworksForGeolocation(
const DictionaryValueCallback& callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
shill::kGetNetworksForGeolocation);
helper_->CallDictionaryValueMethod(&method_call, callback);
}
@@ -55,8 +55,8 @@ class ShillManagerClientImpl : public ShillManagerClient {
const base::Value& value,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kSetPropertyFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kSetPropertyFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(name);
ShillClientHelper::AppendValueDataAsVariant(&writer, value);
@@ -68,8 +68,8 @@ class ShillManagerClientImpl : public ShillManagerClient {
virtual void RequestScan(const std::string& type,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kRequestScanFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kRequestScanFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(type);
helper_->CallVoidMethodWithErrorCallback(&method_call,
@@ -81,8 +81,8 @@ class ShillManagerClientImpl : public ShillManagerClient {
const std::string& type,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kEnableTechnologyFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kEnableTechnologyFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(type);
helper_->CallVoidMethodWithErrorCallback(&method_call,
@@ -94,8 +94,8 @@ class ShillManagerClientImpl : public ShillManagerClient {
const std::string& type,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kDisableTechnologyFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kDisableTechnologyFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(type);
helper_->CallVoidMethodWithErrorCallback(&method_call,
@@ -107,8 +107,8 @@ class ShillManagerClientImpl : public ShillManagerClient {
const base::DictionaryValue& properties,
const ObjectPathCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kConfigureServiceFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kConfigureServiceFunction);
dbus::MessageWriter writer(&method_call);
ShillClientHelper::AppendServicePropertiesDictionary(&writer, properties);
helper_->CallObjectPathMethodWithErrorCallback(&method_call,
@@ -121,7 +121,7 @@ class ShillManagerClientImpl : public ShillManagerClient {
const base::DictionaryValue& properties,
const ObjectPathCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
shill::kConfigureServiceForProfileFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendObjectPath(dbus::ObjectPath(profile_path));
@@ -135,8 +135,8 @@ class ShillManagerClientImpl : public ShillManagerClient {
const base::DictionaryValue& properties,
const ObjectPathCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
- flimflam::kGetServiceFunction);
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
+ shill::kGetServiceFunction);
dbus::MessageWriter writer(&method_call);
ShillClientHelper::AppendServicePropertiesDictionary(&writer, properties);
helper_->CallObjectPathMethodWithErrorCallback(&method_call,
@@ -147,7 +147,7 @@ class ShillManagerClientImpl : public ShillManagerClient {
virtual void VerifyDestination(const VerificationProperties& properties,
const BooleanCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
shill::kVerifyDestinationFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(properties.certificate);
@@ -166,7 +166,7 @@ class ShillManagerClientImpl : public ShillManagerClient {
const std::string& service_path,
const StringCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
shill::kVerifyAndEncryptCredentialsFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(properties.certificate);
@@ -186,7 +186,7 @@ class ShillManagerClientImpl : public ShillManagerClient {
const std::string& data,
const StringCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
shill::kVerifyAndEncryptDataFunction);
dbus::MessageWriter writer(&method_call);
writer.AppendString(properties.certificate);
@@ -204,7 +204,7 @@ class ShillManagerClientImpl : public ShillManagerClient {
virtual void ConnectToBestServices(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
- dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+ dbus::MethodCall method_call(shill::kFlimflamManagerInterface,
shill::kConnectToBestServicesFunction);
helper_->CallVoidMethodWithErrorCallback(&method_call,
callback,
@@ -217,11 +217,10 @@ class ShillManagerClientImpl : public ShillManagerClient {
protected:
virtual void Init(dbus::Bus* bus) OVERRIDE {
- proxy_ =
- bus->GetObjectProxy(flimflam::kFlimflamServiceName,
- dbus::ObjectPath(flimflam::kFlimflamServicePath));
+ proxy_ = bus->GetObjectProxy(shill::kFlimflamServiceName,
+ dbus::ObjectPath(shill::kFlimflamServicePath));
helper_.reset(new ShillClientHelper(bus, proxy_));
- helper_->MonitorPropertyChanged(flimflam::kFlimflamManagerInterface);
+ helper_->MonitorPropertyChanged(shill::kFlimflamManagerInterface);
}
private: