diff options
| author | Samuel Tan <samueltan@google.com> | 2016-01-08 17:25:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-08 17:25:39 +0000 |
| commit | 55ae94c8e0c243b6be2c0dbb23f924ff93ccbc55 (patch) | |
| tree | 54f5ce0915394df5aad10df3eafb8166c0faafbc | |
| parent | b4f43d5abe65dfe85f95f9b6aec0429232f2fdfc (diff) | |
| parent | 0dfe24bcb8ba42e48035d9cc268d7bf92c99ce1b (diff) | |
| download | shill-55ae94c8e0c243b6be2c0dbb23f924ff93ccbc55.tar.gz | |
shill: remove EmitStateChanged() from ManagerAdaptorInterface
am: 0dfe24bcb8
* commit '0dfe24bcb8ba42e48035d9cc268d7bf92c99ce1b':
shill: remove EmitStateChanged() from ManagerAdaptorInterface
| -rw-r--r-- | adaptor_interfaces.h | 2 | ||||
| -rw-r--r-- | dbus/chromeos_manager_dbus_adaptor.cc | 5 | ||||
| -rw-r--r-- | dbus/chromeos_manager_dbus_adaptor.h | 1 | ||||
| -rw-r--r-- | mock_adaptors.h | 2 |
4 files changed, 0 insertions, 10 deletions
diff --git a/adaptor_interfaces.h b/adaptor_interfaces.h index 471eb9e3..73feb821 100644 --- a/adaptor_interfaces.h +++ b/adaptor_interfaces.h @@ -100,8 +100,6 @@ class ManagerAdaptorInterface { virtual void EmitRpcIdentifierArrayChanged( const std::string& name, const std::vector<std::string>& value) = 0; - - virtual void EmitStateChanged(const std::string& new_state) = 0; }; // These are the functions that a Profile adaptor must support diff --git a/dbus/chromeos_manager_dbus_adaptor.cc b/dbus/chromeos_manager_dbus_adaptor.cc index 8b0cb52f..1887201d 100644 --- a/dbus/chromeos_manager_dbus_adaptor.cc +++ b/dbus/chromeos_manager_dbus_adaptor.cc @@ -111,11 +111,6 @@ void ChromeosManagerDBusAdaptor::EmitRpcIdentifierArrayChanged( SendPropertyChangedSignal(name, brillo::Any(paths)); } -void ChromeosManagerDBusAdaptor::EmitStateChanged(const string& new_state) { - SLOG(this, 2) << __func__; - SendStateChangedSignal(new_state); -} - bool ChromeosManagerDBusAdaptor::GetProperties( brillo::ErrorPtr* error, brillo::VariantDictionary* properties) { SLOG(this, 2) << __func__; diff --git a/dbus/chromeos_manager_dbus_adaptor.h b/dbus/chromeos_manager_dbus_adaptor.h index 8632d8a2..4ae20ee7 100644 --- a/dbus/chromeos_manager_dbus_adaptor.h +++ b/dbus/chromeos_manager_dbus_adaptor.h @@ -63,7 +63,6 @@ class ChromeosManagerDBusAdaptor const std::string& name, const std::string& value) override; void EmitRpcIdentifierArrayChanged( const std::string& name, const std::vector<std::string>& value) override; - void EmitStateChanged(const std::string& new_state) override; // Implementation of Manager_adaptor bool GetProperties(brillo::ErrorPtr* error, diff --git a/mock_adaptors.h b/mock_adaptors.h index 4e9e59a5..f96c5f76 100644 --- a/mock_adaptors.h +++ b/mock_adaptors.h @@ -106,8 +106,6 @@ class ManagerMockAdaptor : public ManagerAdaptorInterface { MOCK_METHOD2(EmitRpcIdentifierArrayChanged, void(const std::string&, const std::vector<std::string>&)); - MOCK_METHOD1(EmitStateChanged, void(const std::string&)); - private: const std::string rpc_id_; }; |