diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/base/run_loop.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/base/run_loop.h')
| -rw-r--r-- | chromium/base/run_loop.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/base/run_loop.h b/chromium/base/run_loop.h index b1679073a11..055b1b8146d 100644 --- a/chromium/base/run_loop.h +++ b/chromium/base/run_loop.h @@ -97,9 +97,6 @@ class BASE_EXPORT RunLoop { MessageLoop* loop_; - // WeakPtrFactory for QuitClosure safety. - base::WeakPtrFactory<RunLoop> weak_factory_; - // Parent RunLoop or NULL if this is the top-most RunLoop. RunLoop* previous_run_loop_; @@ -119,6 +116,9 @@ class BASE_EXPORT RunLoop { // that we should quit Run once it becomes idle. bool quit_when_idle_received_; + // WeakPtrFactory for QuitClosure safety. + base::WeakPtrFactory<RunLoop> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(RunLoop); }; |