diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 04:07:05 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 04:07:05 +0000 |
| commit | 3c34dd58e21ea33424c635afaf22c82476f56afb (patch) | |
| tree | ef57c251ae5f3cef33365659a6e9aa1535fc5a32 /chromeos/dbus/shill_manager_client.cc | |
| parent | 2bab166de6e6cdcbd9168a138a5dca1f266d14c3 (diff) | |
| download | chromium_src-3c34dd58e21ea33424c635afaf22c82476f56afb.zip chromium_src-3c34dd58e21ea33424c635afaf22c82476f56afb.tar.gz chromium_src-3c34dd58e21ea33424c635afaf22c82476f56afb.tar.bz2 | |
This converts the Shill clients to use an observer pattern
for property change notifications because in a future CL the
javascript private API will need to listen directly to shill
notifications as well, and the previous implementation was limited to
a single handler.
BUG=chromium:147620,chromium:146616
TEST=Ran unit tests, ran on device.
Review URL: https://chromiumcodereview.appspot.com/10965045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_manager_client.cc')
| -rw-r--r-- | chromeos/dbus/shill_manager_client.cc | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc index 96d0e3e..deb560b 100644 --- a/chromeos/dbus/shill_manager_client.cc +++ b/chromeos/dbus/shill_manager_client.cc @@ -8,6 +8,7 @@ #include "base/chromeos/chromeos_version.h" #include "base/message_loop.h" #include "base/values.h" +#include "chromeos/dbus/shill_property_changed_observer.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" @@ -57,14 +58,16 @@ class ShillManagerClientImpl : public ShillManagerClient { helper_.MonitorPropertyChanged(flimflam::kFlimflamManagerInterface); } - // ShillManagerClient overrides: - virtual void SetPropertyChangedHandler( - const PropertyChangedHandler& handler) OVERRIDE { - helper_.SetPropertyChangedHandler(handler); + //////////////////////////////////// + // ShillManagerClient overrides. + virtual void AddPropertyChangedObserver( + ShillPropertyChangedObserver* observer) OVERRIDE { + helper_.AddPropertyChangedObserver(observer); } - virtual void ResetPropertyChangedHandler() OVERRIDE { - helper_.ResetPropertyChangedHandler(); + virtual void RemovePropertyChangedObserver( + ShillPropertyChangedObserver* observer) OVERRIDE { + helper_.RemovePropertyChangedObserver(observer); } virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE { @@ -163,12 +166,13 @@ class ShillManagerClientStubImpl : public ShillManagerClient { virtual ~ShillManagerClientStubImpl() {} - // ShillManagerClient override. - virtual void SetPropertyChangedHandler( - const PropertyChangedHandler& handler) OVERRIDE {} + ////////////////////////////////// + // ShillManagerClient overrides. + virtual void AddPropertyChangedObserver( + ShillPropertyChangedObserver* observer) OVERRIDE {} - // ShillManagerClient override. - virtual void ResetPropertyChangedHandler() OVERRIDE {} + virtual void RemovePropertyChangedObserver( + ShillPropertyChangedObserver* observer) OVERRIDE {} // ShillManagerClient override. virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE { |