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

Unified Diff: remoting/client/plugin/chromoting_instance.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/client/client_context.cc ('k') | remoting/host/audio_capturer_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 3cbdfec18f37b5f9c3b90132113fa4fa1d9efdfe..73d9d3721aa2220d761f118bee71bebbb1d7d63a 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -168,9 +168,8 @@ bool ChromotingInstance::ParseAuthMethods(const std::string& auth_methods_str,
ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
: pp::Instance(pp_instance),
initialized_(false),
- plugin_task_runner_(
- new PluginThreadTaskRunner(&plugin_thread_delegate_)),
- context_(plugin_task_runner_),
+ plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)),
+ context_(plugin_task_runner_.get()),
input_tracker_(&mouse_input_filter_),
#if defined(OS_MACOSX)
// On Mac we need an extra filter to inject missing keyup events.
@@ -646,7 +645,8 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
// Setup the XMPP Proxy.
xmpp_proxy_ = new PepperXmppProxy(
base::Bind(&ChromotingInstance::SendOutgoingIq, AsWeakPtr()),
- plugin_task_runner_, context_.main_task_runner());
+ plugin_task_runner_.get(),
+ context_.main_task_runner());
scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator(
PepperPortAllocator::Create(this));
@@ -686,7 +686,7 @@ void ChromotingInstance::Disconnect() {
void ChromotingInstance::OnIncomingIq(const std::string& iq) {
// Just ignore the message if it's received before Connect() is called. It's
// likely to be a leftover from a previous session, so it's safe to ignore it.
- if (xmpp_proxy_)
+ if (xmpp_proxy_.get())
xmpp_proxy_->OnIq(iq);
}
« no previous file with comments | « remoting/client/client_context.cc ('k') | remoting/host/audio_capturer_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698