summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/nfc_tag_client.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-01-15 23:37:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-16 07:38:47 +0000
commit0280cb6ec0c9158a01e2f484a6caa83d690b4e66 (patch)
tree4750c3718240f0db11228d8f93aadb734acb01a3 /chromeos/dbus/nfc_tag_client.cc
parent1a492a342aecb37fabf514030d4df0a28e76ec87 (diff)
downloadchromium_src-0280cb6ec0c9158a01e2f484a6caa83d690b4e66.zip
chromium_src-0280cb6ec0c9158a01e2f484a6caa83d690b4e66.tar.gz
chromium_src-0280cb6ec0c9158a01e2f484a6caa83d690b4e66.tar.bz2
Update {virtual,override,final} to follow C++11 style in chromeos/dbus.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was automatically generated with a ChromeOS build using a variation of https://codereview.chromium.org/598073004. BUG=417463 R=hashimoto@chromium.org Review URL: https://codereview.chromium.org/817853005 Cr-Commit-Position: refs/heads/master@{#311851}
Diffstat (limited to 'chromeos/dbus/nfc_tag_client.cc')
-rw-r--r--chromeos/dbus/nfc_tag_client.cc38
1 files changed, 17 insertions, 21 deletions
diff --git a/chromeos/dbus/nfc_tag_client.cc b/chromeos/dbus/nfc_tag_client.cc
index cbcb4d1..5db650a 100644
--- a/chromeos/dbus/nfc_tag_client.cc
+++ b/chromeos/dbus/nfc_tag_client.cc
@@ -46,25 +46,25 @@ class NfcTagClientImpl : public NfcTagClient,
DCHECK(adapter_client);
}
- virtual ~NfcTagClientImpl() {
+ ~NfcTagClientImpl() override {
DCHECK(adapter_client_);
adapter_client_->RemoveObserver(this);
}
// NfcTagClient override.
- virtual void AddObserver(NfcTagClient::Observer* observer) override {
+ void AddObserver(NfcTagClient::Observer* observer) override {
DCHECK(observer);
observers_.AddObserver(observer);
}
// NfcTagClient override.
- virtual void RemoveObserver(NfcTagClient::Observer* observer) override {
+ void RemoveObserver(NfcTagClient::Observer* observer) override {
DCHECK(observer);
observers_.RemoveObserver(observer);
}
// NfcTagClient override.
- virtual std::vector<dbus::ObjectPath> GetTagsForAdapter(
+ std::vector<dbus::ObjectPath> GetTagsForAdapter(
const dbus::ObjectPath& adapter_path) override {
DBusObjectMap* object_map =
adapters_to_object_maps_.GetObjectMap(adapter_path);
@@ -74,18 +74,16 @@ class NfcTagClientImpl : public NfcTagClient,
}
// NfcTagClient override.
- virtual Properties* GetProperties(
- const dbus::ObjectPath& object_path) override {
+ Properties* GetProperties(const dbus::ObjectPath& object_path) override {
return static_cast<Properties*>(
adapters_to_object_maps_.FindObjectProperties(object_path));
}
// NfcTagClient override.
- virtual void Write(
- const dbus::ObjectPath& object_path,
- const base::DictionaryValue& attributes,
- const base::Closure& callback,
- const nfc_client_helpers::ErrorCallback& error_callback) override {
+ void Write(const dbus::ObjectPath& object_path,
+ const base::DictionaryValue& attributes,
+ const base::Closure& callback,
+ const nfc_client_helpers::ErrorCallback& error_callback) override {
dbus::ObjectProxy* object_proxy =
adapters_to_object_maps_.FindObjectProxy(object_path);
if (!object_proxy) {
@@ -121,7 +119,7 @@ class NfcTagClientImpl : public NfcTagClient,
protected:
// DBusClient override.
- virtual void Init(dbus::Bus* bus) override {
+ void Init(dbus::Bus* bus) override {
VLOG(1) << "Creating NfcTagClientImpl";
DCHECK(bus);
bus_ = bus;
@@ -131,7 +129,7 @@ class NfcTagClientImpl : public NfcTagClient,
private:
// NfcAdapterClient::Observer override.
- virtual void AdapterAdded(const dbus::ObjectPath& object_path) override {
+ void AdapterAdded(const dbus::ObjectPath& object_path) override {
VLOG(1) << "Adapter added. Creating map for tag proxies belonging to "
<< "adapter: " << object_path.value();
adapters_to_object_maps_.CreateObjectMap(
@@ -139,7 +137,7 @@ class NfcTagClientImpl : public NfcTagClient,
}
// NfcAdapterClient::Observer override.
- virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override {
+ void AdapterRemoved(const dbus::ObjectPath& object_path) override {
// Neard doesn't send out property changed signals for the tags that
// are removed when the adapter they belong to is removed. Clean up the
// object proxies for devices that are managed by the removed adapter.
@@ -151,9 +149,8 @@ class NfcTagClientImpl : public NfcTagClient,
}
// NfcAdapterClient::Observer override.
- virtual void AdapterPropertyChanged(
- const dbus::ObjectPath& object_path,
- const std::string& property_name) override {
+ void AdapterPropertyChanged(const dbus::ObjectPath& object_path,
+ const std::string& property_name) override {
// Update the tag proxies.
DCHECK(adapter_client_);
NfcAdapterClient::Properties *adapter_properties =
@@ -180,8 +177,7 @@ class NfcTagClientImpl : public NfcTagClient,
}
// nfc_client_helpers::DBusObjectMap::Delegate override.
- virtual NfcPropertySet* CreateProperties(
- dbus::ObjectProxy* object_proxy) override {
+ NfcPropertySet* CreateProperties(dbus::ObjectProxy* object_proxy) override {
Properties* properties = new Properties(
object_proxy,
base::Bind(&NfcTagClientImpl::OnPropertyChanged,
@@ -195,12 +191,12 @@ class NfcTagClientImpl : public NfcTagClient,
}
// nfc_client_helpers::DBusObjectMap::Delegate override.
- virtual void ObjectAdded(const dbus::ObjectPath& object_path) override {
+ void ObjectAdded(const dbus::ObjectPath& object_path) override {
FOR_EACH_OBSERVER(NfcTagClient::Observer, observers_,
TagAdded(object_path));
}
- virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override {
+ void ObjectRemoved(const dbus::ObjectPath& object_path) override {
FOR_EACH_OBSERVER(NfcTagClient::Observer, observers_,
TagRemoved(object_path));
}