diff options
| author | dcheng <dcheng@chromium.org> | 2014-11-13 15:30:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-13 23:35:37 +0000 |
| commit | 4da4d40742403e9a9cad302473f4dce1745a149f (patch) | |
| tree | 74ff32b961a62ee210e2095dbc4750665d265a4c | |
| parent | ec8ea5bd036fbcdafe4c109afffdad50e9ae6c70 (diff) | |
| download | chromium_src-4da4d40742403e9a9cad302473f4dce1745a149f.zip chromium_src-4da4d40742403e9a9cad302473f4dce1745a149f.tar.gz chromium_src-4da4d40742403e9a9cad302473f4dce1745a149f.tar.bz2 | |
Remove implicit conversions from scoped_refptr to T* in ash/
This patch was generated by running the rewrite_scoped_refptr clang tool
on a Windows build.
BUG=110610
Review URL: https://codereview.chromium.org/720753003
Cr-Commit-Position: refs/heads/master@{#304113}
| -rw-r--r-- | ash/system/win/audio/tray_audio_delegate_win.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/system/win/audio/tray_audio_delegate_win.cc b/ash/system/win/audio/tray_audio_delegate_win.cc index a351221..18e46af 100644 --- a/ash/system/win/audio/tray_audio_delegate_win.cc +++ b/ash/system/win/audio/tray_audio_delegate_win.cc @@ -36,7 +36,7 @@ int TrayAudioDelegateWin::GetOutputDefaultVolumeMuteLevel() { int TrayAudioDelegateWin::GetOutputVolumeLevel() { ScopedComPtr<ISimpleAudioVolume> volume_control = CreateDefaultVolumeControl(); - if (!volume_control) + if (!volume_control.get()) return 0; float level = 0.0f; @@ -61,7 +61,7 @@ bool TrayAudioDelegateWin::IsOutputAudioMuted() { ScopedComPtr<ISimpleAudioVolume> volume_control = CreateDefaultVolumeControl(); - if (!volume_control) + if (!volume_control.get()) return false; BOOL mute = FALSE; @@ -75,7 +75,7 @@ void TrayAudioDelegateWin::SetOutputAudioIsMuted(bool is_muted) { ScopedComPtr<ISimpleAudioVolume> volume_control = CreateDefaultVolumeControl(); - if (!volume_control) + if (!volume_control.get()) return; volume_control->SetMute(is_muted, NULL); @@ -85,7 +85,7 @@ void TrayAudioDelegateWin::SetOutputVolumeLevel(int level) { ScopedComPtr<ISimpleAudioVolume> volume_control = CreateDefaultVolumeControl(); - if (!volume_control) + if (!volume_control.get()) return; float volume_level = static_cast<float>(level) / 100.0f; @@ -103,9 +103,9 @@ TrayAudioDelegateWin::CreateDefaultVolumeControl() { ScopedComPtr<IMMDevice> device = media::CoreAudioUtil::CreateDefaultDevice(eRender, eConsole); - if (!device || + if (!device.get() || FAILED(device->Activate(__uuidof(IAudioSessionManager), CLSCTX_ALL, NULL, - session_manager.ReceiveVoid()))) { + session_manager.ReceiveVoid()))) { return volume_control; } |