diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/base/run_loop.cc | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
| download | qtwebengine-chromium-ab0a50979b9eb4dfa3320eff7e187e41efedf7a9.tar.gz | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/base/run_loop.cc')
| -rw-r--r-- | chromium/base/run_loop.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/base/run_loop.cc b/chromium/base/run_loop.cc index 8666ee448fe..8344aa41b16 100644 --- a/chromium/base/run_loop.cc +++ b/chromium/base/run_loop.cc @@ -6,6 +6,10 @@ #include "base/bind.h" +#if defined(OS_WIN) +#include "base/message_loop/message_pump_dispatcher.h" +#endif + namespace base { RunLoop::RunLoop() @@ -17,15 +21,13 @@ RunLoop::RunLoop() running_(false), quit_when_idle_received_(false), weak_factory_(this) { -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ - !defined(USE_GTK_MESSAGE_PUMP) +#if defined(OS_WIN) dispatcher_ = NULL; #endif } -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ - !defined(USE_GTK_MESSAGE_PUMP) -RunLoop::RunLoop(MessageLoop::Dispatcher* dispatcher) +#if defined(OS_WIN) +RunLoop::RunLoop(MessagePumpDispatcher* dispatcher) : loop_(MessageLoop::current()), previous_run_loop_(NULL), dispatcher_(dispatcher), |