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

Side by Side Diff: ash/system/audio/tray_audio.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/audio/tray_audio.h" 5 #include "ash/system/audio/tray_audio.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 24 matching lines...) Expand all
35 #include "ui/views/controls/button/image_button.h" 35 #include "ui/views/controls/button/image_button.h"
36 #include "ui/views/controls/image_view.h" 36 #include "ui/views/controls/image_view.h"
37 #include "ui/views/controls/label.h" 37 #include "ui/views/controls/label.h"
38 #include "ui/views/controls/slider.h" 38 #include "ui/views/controls/slider.h"
39 #include "ui/views/layout/box_layout.h" 39 #include "ui/views/layout/box_layout.h"
40 #include "ui/views/view.h" 40 #include "ui/views/view.h"
41 41
42 namespace ash { 42 namespace ash {
43 43
44 TrayAudio::TrayAudio(SystemTray* system_tray, 44 TrayAudio::TrayAudio(SystemTray* system_tray,
45 scoped_ptr<system::TrayAudioDelegate> audio_delegate) 45 std::unique_ptr<system::TrayAudioDelegate> audio_delegate)
46 : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE), 46 : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE),
47 audio_delegate_(std::move(audio_delegate)), 47 audio_delegate_(std::move(audio_delegate)),
48 volume_view_(NULL), 48 volume_view_(NULL),
49 pop_up_volume_view_(false) { 49 pop_up_volume_view_(false) {
50 Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this); 50 Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this);
51 gfx::Screen::GetScreen()->AddObserver(this); 51 gfx::Screen::GetScreen()->AddObserver(this);
52 } 52 }
53 53
54 TrayAudio::~TrayAudio() { 54 TrayAudio::~TrayAudio() {
55 gfx::Screen::GetScreen()->RemoveObserver(this); 55 gfx::Screen::GetScreen()->RemoveObserver(this);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 if (tray_view()) 179 if (tray_view())
180 tray_view()->SetVisible(GetInitialVisibility()); 180 tray_view()->SetVisible(GetInitialVisibility());
181 if (volume_view_) { 181 if (volume_view_) {
182 volume_view_->SetVolumeLevel( 182 volume_view_->SetVolumeLevel(
183 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); 183 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
184 volume_view_->Update(); 184 volume_view_->Update();
185 } 185 }
186 } 186 }
187 187
188 } // namespace ash 188 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698