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

Unified Diff: remoting/host/desktop_process.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/host/client_session.cc ('k') | remoting/host/desktop_process_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_process.cc
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc
index 2f524aa1dae207b75db16a13e67f5c3452084eb6..232a7e390104125f6652cb5135a0ca1cee068311 100644
--- a/remoting/host/desktop_process.cc
+++ b/remoting/host/desktop_process.cc
@@ -36,7 +36,7 @@ DesktopProcess::DesktopProcess(
DesktopProcess::~DesktopProcess() {
DCHECK(!daemon_channel_);
- DCHECK(!desktop_agent_);
+ DCHECK(!desktop_agent_.get());
}
DesktopEnvironmentFactory& DesktopProcess::desktop_environment_factory() {
@@ -79,7 +79,7 @@ void DesktopProcess::OnChannelConnected(int32 peer_pid) {
void DesktopProcess::OnChannelError() {
// Shutdown the desktop process.
daemon_channel_.reset();
- if (desktop_agent_) {
+ if (desktop_agent_.get()) {
desktop_agent_->Stop();
desktop_agent_ = NULL;
}
@@ -142,7 +142,7 @@ bool DesktopProcess::Start(
daemon_channel_.reset(new IPC::ChannelProxy(daemon_channel_name_,
IPC::Channel::MODE_CLIENT,
this,
- io_task_runner));
+ io_task_runner.get()));
// Pass |desktop_pipe| to the daemon.
daemon_channel_->Send(
« no previous file with comments | « remoting/host/client_session.cc ('k') | remoting/host/desktop_process_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698