Index: base/message_loop/message_pump_win.h |
diff --git a/base/message_loop/message_pump_win.h b/base/message_loop/message_pump_win.h |
index b25731742285a1ccc2381cd563942c845e844b80..e2fbd1e7138582b6321093a4d4a8db6548f5e4a8 100644 |
--- a/base/message_loop/message_pump_win.h |
+++ b/base/message_loop/message_pump_win.h |
@@ -25,14 +25,13 @@ namespace base { |
class BASE_EXPORT MessagePumpWin : public MessagePump { |
public: |
MessagePumpWin() : have_work_(0), state_(NULL) {} |
- virtual ~MessagePumpWin() {} |
dcheng
2015/04/16 21:03:26
How don't we don't need this? I guess the plugin o
Nico
2015/04/16 21:06:58
It complains "virtual methods shouldn't be inline"
|
// Like MessagePump::Run, but MSG objects are routed through dispatcher. |
void RunWithDispatcher(Delegate* delegate, MessagePumpDispatcher* dispatcher); |
// MessagePump methods: |
- virtual void Run(Delegate* delegate) { RunWithDispatcher(delegate, NULL); } |
- virtual void Quit(); |
+ void Run(Delegate* delegate) override; |
+ void Quit() override; |
protected: |
struct RunState { |
@@ -118,15 +117,15 @@ class BASE_EXPORT MessagePumpForUI : public MessagePumpWin { |
virtual ~MessagePumpForUI(); |
// MessagePump methods: |
- virtual void ScheduleWork(); |
- virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time); |
+ void ScheduleWork() override; |
+ void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override; |
private: |
static LRESULT CALLBACK WndProcThunk(HWND window_handle, |
UINT message, |
WPARAM wparam, |
LPARAM lparam); |
- virtual void DoRunLoop(); |
+ void DoRunLoop() override; |
void InitMessageWnd(); |
void WaitForWork(); |
void HandleWorkMessage(); |
@@ -267,11 +266,11 @@ class BASE_EXPORT MessagePumpForIO : public MessagePumpWin { |
}; |
MessagePumpForIO(); |
- virtual ~MessagePumpForIO() {} |
+ ~MessagePumpForIO() override; |
// MessagePump methods: |
- virtual void ScheduleWork(); |
- virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time); |
+ void ScheduleWork() override; |
+ void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override; |
// Register the handler to be used when asynchronous IO for the given file |
// completes. The registration persists as long as |file_handle| is valid, so |
@@ -311,7 +310,7 @@ class BASE_EXPORT MessagePumpForIO : public MessagePumpWin { |
bool has_valid_io_context; |
}; |
- virtual void DoRunLoop(); |
+ void DoRunLoop() override; |
void WaitForWork(); |
bool MatchCompletedIOItem(IOHandler* filter, IOItem* item); |
bool GetIOItem(DWORD timeout, IOItem* item); |