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

Side by Side Diff: ash/system/chromeos/audio/tray_audio_chromeos.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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
« no previous file with comments | « ash/system/audio/tray_audio.cc ('k') | ash/system/chromeos/audio/tray_audio_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/system/audio/tray_audio.h" 11 #include "ash/system/audio/tray_audio.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "chromeos/dbus/power_manager_client.h" 13 #include "chromeos/dbus/power_manager_client.h"
15 14
16 namespace ash { 15 namespace ash {
17 namespace tray { 16 namespace tray {
18 class AudioDetailedView; 17 class AudioDetailedView;
19 } 18 }
20 19
21 class ASH_EXPORT TrayAudioChromeOs 20 class ASH_EXPORT TrayAudioChromeOs
22 : public TrayAudio, 21 : public TrayAudio,
23 public chromeos::PowerManagerClient::Observer { 22 public chromeos::PowerManagerClient::Observer {
(...skipping 20 matching lines...) Expand all
44 void SuspendDone(const base::TimeDelta& sleep_duration) override; 43 void SuspendDone(const base::TimeDelta& sleep_duration) override;
45 44
46 tray::AudioDetailedView* audio_detail_view_; 45 tray::AudioDetailedView* audio_detail_view_;
47 46
48 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs); 47 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs);
49 }; 48 };
50 49
51 } // namespace ash 50 } // namespace ash
52 51
53 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ 52 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/system/audio/tray_audio.cc ('k') | ash/system/chromeos/audio/tray_audio_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698