diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 04:33:17 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 04:33:17 +0000 |
| commit | f9d8a772bb120d9e4a311c8fb72553d3356a6a3a (patch) | |
| tree | 3e9cfc6461e6df6d318774a5fabf82ab05dbad27 /remoting/host/desktop_process.cc | |
| parent | 83501baf7d4e148982f9068fbca4379ccf983540 (diff) | |
| download | chromium_src-f9d8a772bb120d9e4a311c8fb72553d3356a6a3a.zip chromium_src-f9d8a772bb120d9e4a311c8fb72553d3356a6a3a.tar.gz chromium_src-f9d8a772bb120d9e4a311c8fb72553d3356a6a3a.tar.bz2 | |
Update remoting/ and jingle/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15782010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_process.cc')
| -rw-r--r-- | remoting/host/desktop_process.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc index 2f524aa..232a7e3 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( |