shill: Cleanup - private callback methods shouldn't be virtual.
Fix a not-quite-correct comment while here.
BUG=None
TEST=compilation, unit tests pass. No functional change intended.
Change-Id: Iacf194c3aed49db25103685f5a373344a5820379
Reviewed-on: https://gerrit.chromium.org/gerrit/20638
Tested-by: Nathan J. Williams <njw@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>
diff --git a/cellular.cc b/cellular.cc
index 94ad672..e820d4d 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -337,8 +337,7 @@
capability_->SetupConnectProperties(&properties);
service_->SetState(Service::kStateAssociating);
// TODO(njw): Should a weak pointer be used here instead?
- // Would require something like a WeakPtrFactory on the class,
- // and the Classic and Universal subclasses already have one.
+ // Would require something like a WeakPtrFactory on the class.
ResultCallback cb = Bind(&Cellular::OnConnectReply, this);
capability_->Connect(properties, error, cb);
}
diff --git a/cellular_capability_cdma.h b/cellular_capability_cdma.h
index da71097..37ee3ab 100644
--- a/cellular_capability_cdma.h
+++ b/cellular_capability_cdma.h
@@ -74,22 +74,21 @@
static std::string GetActivationErrorString(uint32 error);
// Signal callbacks from the Modem.CDMA interface
- virtual void OnActivationStateChangedSignal(
+ void OnActivationStateChangedSignal(
uint32 activation_state,
uint32 activation_error,
const DBusPropertiesMap &status_changes);
- virtual void OnRegistrationStateChangedSignal(
+ void OnRegistrationStateChangedSignal(
uint32 state_1x, uint32 state_evdo);
- virtual void OnSignalQualitySignal(uint32 strength);
+ void OnSignalQualitySignal(uint32 strength);
// Method reply callbacks from the Modem.CDMA interface
- virtual void OnActivateReply(const ResultCallback &callback,
- uint32 status, const Error &error);
+ void OnActivateReply(const ResultCallback &callback,
+ uint32 status, const Error &error);
- virtual void OnGetRegistrationStateReply(uint32 state_1x, uint32 state_evdo,
- const Error &error);
- virtual void OnGetSignalQualityReply(uint32 strength,
- const Error &error);
+ void OnGetRegistrationStateReply(uint32 state_1x, uint32 state_evdo,
+ const Error &error);
+ void OnGetSignalQualityReply(uint32 strength, const Error &error);
scoped_ptr<ModemCDMAProxyInterface> proxy_;
base::WeakPtrFactory<CellularCapabilityCDMA> weak_ptr_factory_;
diff --git a/cellular_capability_classic.h b/cellular_capability_classic.h
index c19503f..8778a7c 100644
--- a/cellular_capability_classic.h
+++ b/cellular_capability_classic.h
@@ -129,16 +129,16 @@
void(CellularCapability::*set)(const bool &value, Error *error));
// Method reply and signal callbacks from Modem interface
- virtual void OnModemStateChangedSignal(
+ void OnModemStateChangedSignal(
uint32 old_state, uint32 new_state, uint32 reason);
- virtual void OnGetModemInfoReply(const ResultCallback &callback,
- const ModemHardwareInfo &info,
- const Error &error);
+ void OnGetModemInfoReply(const ResultCallback &callback,
+ const ModemHardwareInfo &info,
+ const Error &error);
// Method reply callbacks from Modem.Simple interface
- virtual void OnGetModemStatusReply(const ResultCallback &callback,
- const DBusPropertiesMap &props,
- const Error &error);
+ void OnGetModemStatusReply(const ResultCallback &callback,
+ const DBusPropertiesMap &props,
+ const Error &error);
Cellular *cellular_;
base::WeakPtrFactory<CellularCapabilityClassic> weak_ptr_factory_;
diff --git a/cellular_capability_gsm.h b/cellular_capability_gsm.h
index bc51061..1cd483d 100644
--- a/cellular_capability_gsm.h
+++ b/cellular_capability_gsm.h
@@ -160,36 +160,35 @@
const KeyValueStore &value, Error *error));
// Signal callbacks
- virtual void OnNetworkModeSignal(uint32 mode);
- virtual void OnRegistrationInfoSignal(uint32 status,
- const std::string &operator_code,
- const std::string &operator_name);
- virtual void OnSignalQualitySignal(uint32 quality);
+ void OnNetworkModeSignal(uint32 mode);
+ void OnRegistrationInfoSignal(uint32 status,
+ const std::string &operator_code,
+ const std::string &operator_name);
+ void OnSignalQualitySignal(uint32 quality);
// Method callbacks
- virtual void OnGetRegistrationInfoReply(uint32 status,
- const std::string &operator_code,
- const std::string &operator_name,
- const Error &error);
- virtual void OnGetSignalQualityReply(uint32 quality, const Error &error);
- virtual void OnRegisterReply(const ResultCallback &callback,
- const Error &error);
- virtual void OnGetIMEIReply(const ResultCallback &callback,
- const std::string &imei,
- const Error &error);
- virtual void OnGetIMSIReply(const ResultCallback &callback,
- const std::string &imsi,
- const Error &error);
- virtual void OnGetSPNReply(const ResultCallback &callback,
- const std::string &spn,
- const Error &error);
- virtual void OnGetMSISDNReply(const ResultCallback &callback,
- const std::string &msisdn,
- const Error &error);
- virtual void OnScanReply(const ResultCallback &callback,
- const GSMScanResults &results,
- const Error &error);
- // TODO(njw): None of the above callbacks need to be virtual.
+ void OnGetRegistrationInfoReply(uint32 status,
+ const std::string &operator_code,
+ const std::string &operator_name,
+ const Error &error);
+ void OnGetSignalQualityReply(uint32 quality, const Error &error);
+ void OnRegisterReply(const ResultCallback &callback,
+ const Error &error);
+ void OnGetIMEIReply(const ResultCallback &callback,
+ const std::string &imei,
+ const Error &error);
+ void OnGetIMSIReply(const ResultCallback &callback,
+ const std::string &imsi,
+ const Error &error);
+ void OnGetSPNReply(const ResultCallback &callback,
+ const std::string &spn,
+ const Error &error);
+ void OnGetMSISDNReply(const ResultCallback &callback,
+ const std::string &msisdn,
+ const Error &error);
+ void OnScanReply(const ResultCallback &callback,
+ const GSMScanResults &results,
+ const Error &error);
void OnConnectReply(const ResultCallback &callback, const Error &error);
scoped_ptr<ModemGSMCardProxyInterface> card_proxy_;
diff --git a/cellular_capability_universal.h b/cellular_capability_universal.h
index ea048cf..79bbe5e 100644
--- a/cellular_capability_universal.h
+++ b/cellular_capability_universal.h
@@ -162,30 +162,29 @@
const KeyValueStore &value, Error *error));
// Signal callbacks
- virtual void OnNetworkModeSignal(uint32 mode);
+ void OnNetworkModeSignal(uint32 mode);
// Property Change notification handlers
- virtual void OnModemPropertiesChanged(
+ void OnModemPropertiesChanged(
const DBusPropertiesMap &properties,
const std::vector<std::string> &invalidated_properties);
// TODO(jglasgow): install generic property change notification handler
- virtual void On3GPPRegistrationChanged(MMModem3gppRegistrationState state,
- const std::string &operator_code,
- const std::string &operator_name);
- virtual void OnSignalQualityChanged(uint32 quality);
+ void On3GPPRegistrationChanged(MMModem3gppRegistrationState state,
+ const std::string &operator_code,
+ const std::string &operator_name);
+ void OnSignalQualityChanged(uint32 quality);
// Updates the sim_path_ variable and creates a new proxy to the
// DBUS ModemManager1.Sim interface
- virtual void OnSimPathChanged(const std::string &sim_path);
+ void OnSimPathChanged(const std::string &sim_path);
// Method callbacks
- virtual void OnRegisterReply(const ResultCallback &callback,
- const Error &error);
- virtual void OnScanReply(const ResultCallback &callback,
- const ScanResults &results,
- const Error &error);
- // TODO(njw): None of the above callbacks need to be virtual.
+ void OnRegisterReply(const ResultCallback &callback,
+ const Error &error);
+ void OnScanReply(const ResultCallback &callback,
+ const ScanResults &results,
+ const Error &error);
void OnConnectReply(const ResultCallback &callback,
const DBus::Path &bearer,
const Error &error);