Chromium Code Reviews| Index: mojo/services/html_viewer/webthread_impl.h |
| diff --git a/mojo/services/html_viewer/webthread_impl.h b/mojo/services/html_viewer/webthread_impl.h |
| index 013310dbedba95e77fa18cb89fe588dde58e7d3e..858a9659c4563df3f4437bee56829a18434eb419 100644 |
| --- a/mojo/services/html_viewer/webthread_impl.h |
| +++ b/mojo/services/html_viewer/webthread_impl.h |
| @@ -15,13 +15,13 @@ namespace html_viewer { |
| class WebThreadBase : public blink::WebThread { |
| public: |
| - virtual ~WebThreadBase(); |
| + ~WebThreadBase() override; |
| - virtual void addTaskObserver(TaskObserver* observer); |
| - virtual void removeTaskObserver(TaskObserver* observer); |
| + void addTaskObserver(TaskObserver* observer) override; |
| + void removeTaskObserver(TaskObserver* observer) override; |
| - virtual bool isCurrentThread() const = 0; |
| - virtual blink::PlatformThreadId threadId() const = 0; |
| + bool isCurrentThread() const override = 0; |
| + blink::PlatformThreadId threadId() const override = 0; |
|
sky
2015/03/31 17:15:57
I don't think this is necessary, can you remove it
|
| protected: |
| WebThreadBase(); |
| @@ -36,20 +36,20 @@ class WebThreadBase : public blink::WebThread { |
| class WebThreadImpl : public WebThreadBase { |
| public: |
| explicit WebThreadImpl(const char* name); |
| - virtual ~WebThreadImpl(); |
| + ~WebThreadImpl() override; |
| - virtual void postTask(const blink::WebTraceLocation& location, Task* task); |
| - virtual void postDelayedTask(const blink::WebTraceLocation& location, |
| - Task* task, |
| - long long delay_ms); |
| + void postTask(const blink::WebTraceLocation& location, Task* task) override; |
| + void postDelayedTask(const blink::WebTraceLocation& location, |
| + Task* task, |
| + long long delay_ms) override; |
| - virtual void enterRunLoop(); |
| - virtual void exitRunLoop(); |
| + void enterRunLoop() override; |
| + void exitRunLoop() override; |
| base::MessageLoop* message_loop() const { return thread_->message_loop(); } |
| - virtual bool isCurrentThread() const; |
| - virtual blink::PlatformThreadId threadId() const; |
| + bool isCurrentThread() const override; |
| + blink::PlatformThreadId threadId() const override; |
| private: |
| scoped_ptr<base::Thread> thread_; |
| @@ -59,19 +59,19 @@ class WebThreadImplForMessageLoop : public WebThreadBase { |
| public: |
| explicit WebThreadImplForMessageLoop( |
| base::MessageLoopProxy* message_loop); |
| - virtual ~WebThreadImplForMessageLoop(); |
| + ~WebThreadImplForMessageLoop() override; |
| - virtual void postTask(const blink::WebTraceLocation& location, Task* task); |
| - virtual void postDelayedTask(const blink::WebTraceLocation& location, |
| - Task* task, |
| - long long delay_ms); |
| + void postTask(const blink::WebTraceLocation& location, Task* task) override; |
| + void postDelayedTask(const blink::WebTraceLocation& location, |
| + Task* task, |
| + long long delay_ms) override; |
| - virtual void enterRunLoop(); |
| - virtual void exitRunLoop(); |
| + void enterRunLoop() override; |
| + void exitRunLoop() override; |
| private: |
| - virtual bool isCurrentThread() const; |
| - virtual blink::PlatformThreadId threadId() const; |
| + bool isCurrentThread() const override; |
| + blink::PlatformThreadId threadId() const override; |
| scoped_refptr<base::MessageLoopProxy> message_loop_; |
| blink::PlatformThreadId thread_id_; |