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 /remoting/signaling | |
| 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 'remoting/signaling')
| -rw-r--r-- | remoting/signaling/fake_signal_strategy.h | 2 | ||||
| -rw-r--r-- | remoting/signaling/xmpp_signal_strategy.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/signaling/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h index 0091ccf9..d0fb99a 100644 --- a/remoting/signaling/fake_signal_strategy.h +++ b/remoting/signaling/fake_signal_strategy.h @@ -72,7 +72,7 @@ class FakeSignalStrategy : public SignalStrategy, std::string jid_; PeerCallback peer_callback_; - ObserverList<Listener, true> listeners_; + base::ObserverList<Listener, true> listeners_; int last_id_; diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc index 693ce19..0a55c34 100644 --- a/remoting/signaling/xmpp_signal_strategy.cc +++ b/remoting/signaling/xmpp_signal_strategy.cc @@ -112,7 +112,7 @@ class XmppSignalStrategy::Core : public XmppLoginHandler::Delegate { Error error_; - ObserverList<Listener, true> listeners_; + base::ObserverList<Listener, true> listeners_; base::Timer keep_alive_timer_; |