summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/update_engine_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/update_engine_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/update_engine_client.cc')
-rw-r--r--chromeos/dbus/update_engine_client.cc78
1 files changed, 33 insertions, 45 deletions
diff --git a/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc
index 321b247..28d5b00 100644
--- a/chromeos/dbus/update_engine_client.cc
+++ b/chromeos/dbus/update_engine_client.cc
@@ -86,24 +86,22 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
UpdateEngineClientImpl()
: update_engine_proxy_(NULL), last_status_(), weak_ptr_factory_(this) {}
- virtual ~UpdateEngineClientImpl() {
- }
+ ~UpdateEngineClientImpl() override {}
// UpdateEngineClient implementation:
- virtual void AddObserver(Observer* observer) override {
+ void AddObserver(Observer* observer) override {
observers_.AddObserver(observer);
}
- virtual void RemoveObserver(Observer* observer) override {
+ void RemoveObserver(Observer* observer) override {
observers_.RemoveObserver(observer);
}
- virtual bool HasObserver(const Observer* observer) const override {
+ bool HasObserver(const Observer* observer) const override {
return observers_.HasObserver(observer);
}
- virtual void RequestUpdateCheck(
- const UpdateCheckCallback& callback) override {
+ void RequestUpdateCheck(const UpdateCheckCallback& callback) override {
dbus::MethodCall method_call(
update_engine::kUpdateEngineInterface,
update_engine::kAttemptUpdate);
@@ -120,7 +118,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
callback));
}
- virtual void RebootAfterUpdate() override {
+ void RebootAfterUpdate() override {
dbus::MethodCall method_call(
update_engine::kUpdateEngineInterface,
update_engine::kRebootIfNeeded);
@@ -133,7 +131,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
weak_ptr_factory_.GetWeakPtr()));
}
- virtual void Rollback() override {
+ void Rollback() override {
VLOG(1) << "Requesting a rollback";
dbus::MethodCall method_call(
update_engine::kUpdateEngineInterface,
@@ -148,9 +146,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
weak_ptr_factory_.GetWeakPtr()));
}
-
- virtual void CanRollbackCheck(
- const RollbackCheckCallback& callback) override {
+ void CanRollbackCheck(const RollbackCheckCallback& callback) override {
dbus::MethodCall method_call(
update_engine::kUpdateEngineInterface,
update_engine::kCanRollback);
@@ -164,12 +160,10 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
callback));
}
- virtual Status GetLastStatus() override {
- return last_status_;
- }
+ Status GetLastStatus() override { return last_status_; }
- virtual void SetChannel(const std::string& target_channel,
- bool is_powerwash_allowed) override {
+ void SetChannel(const std::string& target_channel,
+ bool is_powerwash_allowed) override {
if (!IsValidChannel(target_channel)) {
LOG(ERROR) << "Invalid channel name: " << target_channel;
return;
@@ -192,8 +186,8 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
weak_ptr_factory_.GetWeakPtr()));
}
- virtual void GetChannel(bool get_current_channel,
- const GetChannelCallback& callback) override {
+ void GetChannel(bool get_current_channel,
+ const GetChannelCallback& callback) override {
dbus::MethodCall method_call(
update_engine::kUpdateEngineInterface,
update_engine::kGetChannel);
@@ -211,7 +205,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
}
protected:
- virtual void Init(dbus::Bus* bus) override {
+ void Init(dbus::Bus* bus) override {
update_engine_proxy_ = bus->GetObjectProxy(
update_engine::kUpdateEngineServiceName,
dbus::ObjectPath(update_engine::kUpdateEngineServicePath));
@@ -409,33 +403,29 @@ class UpdateEngineClientStubImpl : public UpdateEngineClient {
target_channel_(kReleaseChannelBeta) {}
// UpdateEngineClient implementation:
- virtual void Init(dbus::Bus* bus) override {}
- virtual void AddObserver(Observer* observer) override {}
- virtual void RemoveObserver(Observer* observer) override {}
- virtual bool HasObserver(const Observer* observer) const override {
- return false;
- }
+ void Init(dbus::Bus* bus) override {}
+ void AddObserver(Observer* observer) override {}
+ void RemoveObserver(Observer* observer) override {}
+ bool HasObserver(const Observer* observer) const override { return false; }
- virtual void RequestUpdateCheck(
- const UpdateCheckCallback& callback) override {
+ void RequestUpdateCheck(const UpdateCheckCallback& callback) override {
callback.Run(UPDATE_RESULT_NOTIMPLEMENTED);
}
- virtual void RebootAfterUpdate() override {}
- virtual void Rollback() override {}
- virtual void CanRollbackCheck(
- const RollbackCheckCallback& callback) override {
+ void RebootAfterUpdate() override {}
+ void Rollback() override {}
+ void CanRollbackCheck(const RollbackCheckCallback& callback) override {
callback.Run(true);
}
- virtual Status GetLastStatus() override { return Status(); }
- virtual void SetChannel(const std::string& target_channel,
- bool is_powerwash_allowed) override {
+ Status GetLastStatus() override { return Status(); }
+ void SetChannel(const std::string& target_channel,
+ bool is_powerwash_allowed) override {
VLOG(1) << "Requesting to set channel: "
<< "target_channel=" << target_channel << ", "
<< "is_powerwash_allowed=" << is_powerwash_allowed;
target_channel_ = target_channel;
}
- virtual void GetChannel(bool get_current_channel,
- const GetChannelCallback& callback) override {
+ void GetChannel(bool get_current_channel,
+ const GetChannelCallback& callback) override {
VLOG(1) << "Requesting to get channel, get_current_channel="
<< get_current_channel;
if (get_current_channel)
@@ -455,26 +445,24 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl {
UpdateEngineClientFakeImpl() : weak_factory_(this) {
}
- virtual ~UpdateEngineClientFakeImpl() {
- }
+ ~UpdateEngineClientFakeImpl() override {}
// UpdateEngineClient implementation:
- virtual void AddObserver(Observer* observer) override {
+ void AddObserver(Observer* observer) override {
if (observer)
observers_.AddObserver(observer);
}
- virtual void RemoveObserver(Observer* observer) override {
+ void RemoveObserver(Observer* observer) override {
if (observer)
observers_.RemoveObserver(observer);
}
- virtual bool HasObserver(const Observer* observer) const override {
+ bool HasObserver(const Observer* observer) const override {
return observers_.HasObserver(observer);
}
- virtual void RequestUpdateCheck(
- const UpdateCheckCallback& callback) override {
+ void RequestUpdateCheck(const UpdateCheckCallback& callback) override {
if (last_status_.status != UPDATE_STATUS_IDLE) {
callback.Run(UPDATE_RESULT_FAILED);
return;
@@ -491,7 +479,7 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl {
base::TimeDelta::FromMilliseconds(kStateTransitionDefaultDelayMs));
}
- virtual Status GetLastStatus() override { return last_status_; }
+ Status GetLastStatus() override { return last_status_; }
private:
void StateTransition() {