diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 20:34:18 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 20:34:18 +0000 |
commit | d690ba464ab9b62373eb6b88435054d79f93a02e (patch) | |
tree | e010ce3b5d8cca5d6e7e03446d5742a7c4439929 /chromeos/dbus/shill_manager_client.h | |
parent | 2a74ed6cca3901234dad1294487a6ccd7b0710c9 (diff) | |
download | chromium_src-d690ba464ab9b62373eb6b88435054d79f93a02e.zip chromium_src-d690ba464ab9b62373eb6b88435054d79f93a02e.tar.gz chromium_src-d690ba464ab9b62373eb6b88435054d79f93a02e.tar.bz2 |
This converts the Shill clients to allow propagation of shill errors
back from the function calls. The existing implentation completely ignores most shill errors, and the javascript implementation will want to be able to receive them to aid in diagnosis.
BUG=chromium:147620,chromium:146616
TEST=Ran unit tests, ran on device.
Review URL: https://chromiumcodereview.appspot.com/10949030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_manager_client.h')
-rw-r--r-- | chromeos/dbus/shill_manager_client.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/chromeos/dbus/shill_manager_client.h b/chromeos/dbus/shill_manager_client.h index 195b230..8034830 100644 --- a/chromeos/dbus/shill_manager_client.h +++ b/chromeos/dbus/shill_manager_client.h @@ -30,6 +30,7 @@ class CHROMEOS_EXPORT ShillManagerClient { public: typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler; typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback; + typedef ShillClientHelper::ErrorCallback ErrorCallback; virtual ~ShillManagerClient(); @@ -62,32 +63,38 @@ class CHROMEOS_EXPORT ShillManagerClient { // |callback| is called after the method call succeeds. virtual void SetProperty(const std::string& name, const base::Value& value, - const VoidDBusMethodCallback& callback) = 0; + const base::Closure& callback, + const ErrorCallback& error_callback) = 0; // Calls RequestScan method. // |callback| is called after the method call succeeds. virtual void RequestScan(const std::string& type, - const VoidDBusMethodCallback& callback) = 0; + const base::Closure& callback, + const ErrorCallback& error_callback) = 0; // Calls EnableTechnology method. // |callback| is called after the method call succeeds. virtual void EnableTechnology(const std::string& type, - const VoidDBusMethodCallback& callback) = 0; + const base::Closure& callback, + const ErrorCallback& error_callback) = 0; // Calls DisableTechnology method. // |callback| is called after the method call succeeds. virtual void DisableTechnology(const std::string& type, - const VoidDBusMethodCallback& callback) = 0; + const base::Closure& callback, + const ErrorCallback& error_callback) = 0; // Calls ConfigureService method. // |callback| is called after the method call succeeds. virtual void ConfigureService(const base::DictionaryValue& properties, - const VoidDBusMethodCallback& callback) = 0; + const base::Closure& callback, + const ErrorCallback& error_callback) = 0; // Calls GetService method. // |callback| is called after the method call succeeds. virtual void GetService(const base::DictionaryValue& properties, - const ObjectPathDBusMethodCallback& callback) = 0; + const ObjectPathCallback& callback, + const ErrorCallback& error_callback) = 0; protected: // Create() should be used instead. |