commit 4c0724af38d0eaf7155bb789280940a41ef9f08c
author Jason Glasgow <jglasgow@chromium.org> Tue Apr 17 15:47:40 2012 -0400
committer Gerrit <chrome-bot@google.com> Wed Apr 18 12:37:36 2012 -0700
tree 4b407b7f4651e6a2f2e2431fea101d6bfe8c8d1a
parent 2f903b3842af547e062fbf7b21a04e103211dec3

shill: cellular: simplify property change notification

Simplify property change notification by using a single mechanism to
handle it instead of two.  Old style notifications are turned into new
style notifications by the modem object.

A few minor style clean ups -- remove std:: where not needed and
ensure that public interfaces are declared as public interfaces in
subclasses (i.e not protected).

BUG=chromium-os:29569
TEST=run unit tests

Change-Id: If8b957d8b6518c95fa1d20bdef7d1ec6a8ed5ea3
Reviewed-on: https://gerrit.chromium.org/gerrit/20395
Tested-by: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Nathan J. Williams <njw@chromium.org>
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>

cellular_capability_universal.cc

diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index 0f044aa..1061b75 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -287,7 +287,7 @@
   OnUnsupportedOperation(__func__, error);
 }
 
-void CellularCapabilityUniversal::Activate(const std::string &carrier,
+void CellularCapabilityUniversal::Activate(const string &carrier,
                                            Error *error,
                                            const ResultCallback &callback) {
   OnUnsupportedOperation(__func__, error);
@@ -671,7 +671,7 @@
 }
 
 void CellularCapabilityUniversal::RequirePIN(
-    const std::string &pin, bool require,
+    const string &pin, bool require,
     Error *error, const ResultCallback &callback) {
   CHECK(error);
   sim_proxy_->EnablePin(pin, require, error, callback, kTimeoutDefault);
@@ -847,11 +847,13 @@
   NOTIMPLEMENTED();
 }
 
-void CellularCapabilityUniversal::OnModemManagerPropertiesChanged(
-    const DBusPropertiesMap &properties) {
-
-  // TODO(jglasgow): When CreateDeviceFromModemProperties is fixed DCHECK
-  LOG(ERROR) << "Unexpected call to OnModemPropertiesChanged.";
+void CellularCapabilityUniversal::OnModemPropertiesChanged(
+    const DBusPropertiesMap &properties,
+    const vector<string> &/* invalidated_properties */) {
+  string value;
+  if (DBusProperties::GetString(properties,
+                                MM_MODEM_PROPERTY_SIM, &value))
+    OnSimPathChanged(value);
 
   uint32 access_technologies = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
   if (DBusProperties::GetUint32(properties,
@@ -882,13 +884,9 @@
 void CellularCapabilityUniversal::OnDBusPropertiesChanged(
     const string &interface,
     const DBusPropertiesMap &changed_properties,
-    const vector<std::string> &invalidated_properties) {
+    const vector<string> &invalidated_properties) {
   if (interface == MM_DBUS_INTERFACE_MODEM) {
-    string value;
-    if (DBusProperties::GetString(changed_properties,
-                                  MM_MODEM_PROPERTY_SIM, &value))
-      OnSimPathChanged(value);
-    // TODO(jglasgow): handle additional properties on the modem interface
+    OnModemPropertiesChanged(changed_properties, invalidated_properties);
   }
   // TODO(jglasgow): handle additional interfaces
 }