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/jingle/notifier/listener/non_blocking_push_client.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/jingle/notifier/listener/non_blocking_push_client.h')
| -rw-r--r-- | chromium/jingle/notifier/listener/non_blocking_push_client.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/jingle/notifier/listener/non_blocking_push_client.h b/chromium/jingle/notifier/listener/non_blocking_push_client.h index f5c6bc48e09..b49ae03b5d8 100644 --- a/chromium/jingle/notifier/listener/non_blocking_push_client.h +++ b/chromium/jingle/notifier/listener/non_blocking_push_client.h @@ -60,12 +60,13 @@ class NonBlockingPushClient : public PushClient { void OnPingResponse(); base::ThreadChecker thread_checker_; - base::WeakPtrFactory<NonBlockingPushClient> weak_ptr_factory_; const scoped_refptr<base::SingleThreadTaskRunner> delegate_task_runner_; - const scoped_refptr<Core> core_; + scoped_refptr<Core> core_; ObserverList<PushClientObserver> observers_; + base::WeakPtrFactory<NonBlockingPushClient> weak_ptr_factory_; + DISALLOW_COPY_AND_ASSIGN(NonBlockingPushClient); }; |