Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Unified Diff: base/message_loop/message_pump_win.h

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..00f1287ce437ee020b22c83593f3104c20dc9348 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() {}
// 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 {
@@ -115,18 +114,18 @@ class BASE_EXPORT MessagePumpForUI : public MessagePumpWin {
static const int kMessageFilterCode = 0x5001;
MessagePumpForUI();
- virtual ~MessagePumpForUI();
+ ~MessagePumpForUI() 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;
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);

Powered by Google App Engine
This is Rietveld 408576698