diff options
| author | brettw <brettw@chromium.org> | 2015-06-03 09:31:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 16:32:08 +0000 |
| commit | 236d317f450601fbb56756b0b5ca802659a045f6 (patch) | |
| tree | 086f7f2ed78889e4dc2c17f209871ba364bc9c01 /jingle | |
| parent | e7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff) | |
| download | chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.zip chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.gz chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.bz2 | |
Replace more ObserverList with base::ObserverList.
This is everything but the chrome directory
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=zelidrag@chromium.org (chromeos)
TBR=keybuk@chromium.org (device/bluetooth)
Review URL: https://codereview.chromium.org/1162943002
Cr-Commit-Position: refs/heads/master@{#332626}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/listener/fake_push_client.h | 2 | ||||
| -rw-r--r-- | jingle/notifier/listener/non_blocking_push_client.h | 2 | ||||
| -rw-r--r-- | jingle/notifier/listener/xmpp_push_client.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/jingle/notifier/listener/fake_push_client.h b/jingle/notifier/listener/fake_push_client.h index 3c12f51..466081d9 100644 --- a/jingle/notifier/listener/fake_push_client.h +++ b/jingle/notifier/listener/fake_push_client.h @@ -46,7 +46,7 @@ class FakePushClient : public PushClient { int sent_pings() const; private: - ObserverList<PushClientObserver> observers_; + base::ObserverList<PushClientObserver> observers_; SubscriptionList subscriptions_; std::string email_; std::string token_; diff --git a/jingle/notifier/listener/non_blocking_push_client.h b/jingle/notifier/listener/non_blocking_push_client.h index 27e07fb..f91c971 100644 --- a/jingle/notifier/listener/non_blocking_push_client.h +++ b/jingle/notifier/listener/non_blocking_push_client.h @@ -62,7 +62,7 @@ class NonBlockingPushClient : public PushClient { const scoped_refptr<base::SingleThreadTaskRunner> delegate_task_runner_; scoped_refptr<Core> core_; - ObserverList<PushClientObserver> observers_; + base::ObserverList<PushClientObserver> observers_; base::WeakPtrFactory<NonBlockingPushClient> weak_ptr_factory_; diff --git a/jingle/notifier/listener/xmpp_push_client.h b/jingle/notifier/listener/xmpp_push_client.h index ea63eb7..a37f496 100644 --- a/jingle/notifier/listener/xmpp_push_client.h +++ b/jingle/notifier/listener/xmpp_push_client.h @@ -71,7 +71,7 @@ class XmppPushClient : private: base::ThreadChecker thread_checker_; const NotifierOptions notifier_options_; - ObserverList<PushClientObserver> observers_; + base::ObserverList<PushClientObserver> observers_; // XMPP connection settings. SubscriptionList subscriptions_; |