Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: remoting/client/chromoting_client.cc

Issue 15782010: Update remoting/ and jingle/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/socket_reader.cc ('k') | remoting/client/client_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/chromoting_client.cc
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 265387a28e3ea0b6d8862c3cbaee203bba1b831d..4411adfaaf453edbe1c4abab703206d2494525c6 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -68,10 +68,16 @@ void ChromotingClient::Start(
// Create a WeakPtr to ourself for to use for all posted tasks.
weak_ptr_ = weak_factory_.GetWeakPtr();
- connection_->Connect(xmpp_proxy, config_.local_jid, config_.host_jid,
- config_.host_public_key, transport_factory.Pass(),
- authenticator.Pass(), this, this, this,
- rectangle_decoder_,
+ connection_->Connect(xmpp_proxy,
+ config_.local_jid,
+ config_.host_jid,
+ config_.host_public_key,
+ transport_factory.Pass(),
+ authenticator.Pass(),
+ this,
+ this,
+ this,
+ rectangle_decoder_.get(),
audio_decode_scheduler_.get());
}
@@ -83,7 +89,7 @@ void ChromotingClient::Stop(const base::Closure& shutdown_task) {
}
FrameProducer* ChromotingClient::GetFrameProducer() {
- return rectangle_decoder_;
+ return rectangle_decoder_.get();
}
void ChromotingClient::OnDisconnected(const base::Closure& shutdown_task) {
« no previous file with comments | « remoting/base/socket_reader.cc ('k') | remoting/client/client_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698