chromeos/audio/cras_audio_handler.cc - Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/audio/cras_audio_handler.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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 | « chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc ('k') | chromeos/dbus/blocking_method_caller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/audio/cras_audio_handler.cc

diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc

index 7ad5c844e1cb875646e0fd0fc2219ca9aad3f43f..fdd794932ada003262c134f50974181e58dee06f 100644

--- a/chromeos/audio/cras_audio_handler.cc

+++ b/chromeos/audio/cras_audio_handler.cc

@@ -275,7 +275,7 @@ CrasAudioHandler::CrasAudioHandler(

has_alternative_output_(false),

output_mute_locked_(false),

input_mute_locked_(false) {

- if (!audio_pref_handler)

+ if (!audio_pref_handler.get())

return;

// If the DBusThreadManager or the CrasAudioClient aren't available, there

// isn't much we can do. This should only happen when running tests.

@@ -295,7 +295,7 @@ CrasAudioHandler::~CrasAudioHandler() {

return;

chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->

RemoveObserver(this);

- if (audio_pref_handler_)

+ if (audio_pref_handler_.get())

audio_pref_handler_->RemoveAudioPrefObserver(this);

audio_pref_handler_ = NULL;

}