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

Unified Diff: remoting/host/client_session.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/chromoting_host_context.cc ('k') | remoting/host/desktop_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session.cc
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index 38ec520d6dc9219316a5ec56acac5fbc6fbccd3a..2f17ce854442ff00094337bff4ef41cca2e0ac7e 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -86,11 +86,11 @@ ClientSession::ClientSession(
ClientSession::~ClientSession() {
DCHECK(CalledOnValidThread());
- DCHECK(!audio_scheduler_);
+ DCHECK(!audio_scheduler_.get());
DCHECK(!desktop_environment_);
DCHECK(!input_injector_);
DCHECK(!screen_controls_);
- DCHECK(!video_scheduler_);
+ DCHECK(!video_scheduler_.get());
connection_.reset();
}
@@ -138,7 +138,7 @@ void ClientSession::ControlAudio(const protocol::AudioControl& audio_control) {
if (audio_control.has_enable()) {
VLOG(1) << "Received AudioControl (enable="
<< audio_control.enable() << ")";
- if (audio_scheduler_)
+ if (audio_scheduler_.get())
audio_scheduler_->Pause(!audio_control.enable());
}
}
@@ -176,11 +176,11 @@ void ClientSession::OnConnectionAuthenticated(
protocol::ConnectionToClient* connection) {
DCHECK(CalledOnValidThread());
DCHECK_EQ(connection_.get(), connection);
- DCHECK(!audio_scheduler_);
+ DCHECK(!audio_scheduler_.get());
DCHECK(!desktop_environment_);
DCHECK(!input_injector_);
DCHECK(!screen_controls_);
- DCHECK(!video_scheduler_);
+ DCHECK(!video_scheduler_.get());
auth_input_filter_.set_enabled(true);
auth_clipboard_filter_.set_enabled(true);
@@ -311,11 +311,11 @@ void ClientSession::OnConnectionClosed(
// Stop components access the client, audio or video stubs, which are no
// longer valid once ConnectionToClient calls OnConnectionClosed().
- if (audio_scheduler_) {
+ if (audio_scheduler_.get()) {
audio_scheduler_->Stop();
audio_scheduler_ = NULL;
}
- if (video_scheduler_) {
+ if (video_scheduler_.get()) {
video_scheduler_->Stop();
video_scheduler_ = NULL;
}
@@ -335,7 +335,7 @@ void ClientSession::OnSequenceNumberUpdated(
DCHECK(CalledOnValidThread());
DCHECK_EQ(connection_.get(), connection);
- if (video_scheduler_)
+ if (video_scheduler_.get())
video_scheduler_->UpdateSequenceNumber(sequence_number);
event_handler_->OnSessionSequenceNumber(this, sequence_number);
« no previous file with comments | « remoting/host/chromoting_host_context.cc ('k') | remoting/host/desktop_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698