Commit 8e3e03ec authored by dcheng's avatar dcheng Committed by Commit bot

Update {virtual,override,final} to follow C++11 style in base.

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 an OS=android build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463

Review URL: https://codereview.chromium.org/900613004

Cr-Commit-Position: refs/heads/master@{#314951}
parent 5b459de0
......@@ -40,7 +40,7 @@ void DeleteLocalRef(JNIEnv* env, jobject obj) {
class ScopedJavaRefTest : public testing::Test {
protected:
virtual void SetUp() {
void SetUp() override {
g_local_refs = 0;
g_global_refs = 0;
JNIEnv* env = AttachCurrentThread();
......@@ -55,7 +55,7 @@ class ScopedJavaRefTest : public testing::Test {
hooked_functions.DeleteLocalRef = &DeleteLocalRef;
}
virtual void TearDown() {
void TearDown() override {
JNIEnv* env = AttachCurrentThread();
env->functions = g_previous_functions;
}
......
......@@ -57,11 +57,11 @@ class TraceEventDataConverter {
class TraceEnabledObserver : public debug::TraceLog::EnabledStateObserver {
public:
virtual void OnTraceLogEnabled() override {
void OnTraceLogEnabled() override {
JNIEnv* env = base::android::AttachCurrentThread();
base::android::Java_TraceEvent_setEnabled(env, true);
}
virtual void OnTraceLogDisabled() override {
void OnTraceLogDisabled() override {
JNIEnv* env = base::android::AttachCurrentThread();
base::android::Java_TraceEvent_setEnabled(env, false);
}
......
......@@ -25,20 +25,20 @@ class DiscardableMemoryAshmem
DiscardableMemoryAshmemAllocator* allocator,
DiscardableMemoryManager* manager);
virtual ~DiscardableMemoryAshmem();
~DiscardableMemoryAshmem() override;
bool Initialize();
// Overridden from DiscardableMemory:
virtual DiscardableMemoryLockStatus Lock() override;
virtual void Unlock() override;
virtual void* Memory() const override;
DiscardableMemoryLockStatus Lock() override;
void Unlock() override;
void* Memory() const override;
// Overridden from internal::DiscardableMemoryManagerAllocation:
virtual bool AllocateAndAcquireLock() override;
virtual void ReleaseLock() override;
virtual void Purge() override;
virtual bool IsMemoryResident() const override;
bool AllocateAndAcquireLock() override;
void ReleaseLock() override;
void Purge() override;
bool IsMemoryResident() const override;
private:
const size_t bytes_;
......
......@@ -22,12 +22,12 @@ class TimeTicks;
class BASE_EXPORT MessagePumpForUI : public MessagePump {
public:
MessagePumpForUI();
virtual ~MessagePumpForUI();
~MessagePumpForUI() override;
virtual void Run(Delegate* delegate) override;
virtual void Quit() override;
virtual void ScheduleWork() override;
virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override;
void Run(Delegate* delegate) override;
void Quit() override;
void ScheduleWork() override;
void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override;
virtual void Start(Delegate* delegate);
......
......@@ -72,14 +72,14 @@ class Waitable {
// The MessagePumpForUI implementation for test purpose.
class MessagePumpForUIStub : public base::MessagePumpForUI {
virtual ~MessagePumpForUIStub() {}
~MessagePumpForUIStub() override {}
virtual void Start(base::MessagePump::Delegate* delegate) override {
void Start(base::MessagePump::Delegate* delegate) override {
NOTREACHED() << "The Start() method shouldn't be called in test, using"
" Run() method should be used.";
}
virtual void Run(base::MessagePump::Delegate* delegate) override {
void Run(base::MessagePump::Delegate* delegate) override {
// The following was based on message_pump_glib.cc, except we're using a
// WaitableEvent since there are no native message loop to use.
RunState state(delegate, g_state ? g_state->run_depth + 1 : 1);
......@@ -119,16 +119,11 @@ class MessagePumpForUIStub : public base::MessagePumpForUI {
g_state = previous_state;
}
virtual void Quit() override {
Waitable::GetInstance()->Quit();
}
void Quit() override { Waitable::GetInstance()->Quit(); }
virtual void ScheduleWork() override {
Waitable::GetInstance()->Signal();
}
void ScheduleWork() override { Waitable::GetInstance()->Signal(); }
virtual void ScheduleDelayedWork(
const base::TimeTicks& delayed_work_time) override {
void ScheduleDelayedWork(const base::TimeTicks& delayed_work_time) override {
Waitable::GetInstance()->Signal();
}
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment