OLD | NEW |
---|---|
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 <memory> | |
oshima
2016/04/08 07:09:41
remove this?
| |
11 | |
10 #include "ash/ash_export.h" | 12 #include "ash/ash_export.h" |
11 #include "ash/system/audio/tray_audio.h" | 13 #include "ash/system/audio/tray_audio.h" |
12 #include "base/macros.h" | 14 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "chromeos/dbus/power_manager_client.h" | 15 #include "chromeos/dbus/power_manager_client.h" |
15 | 16 |
16 namespace ash { | 17 namespace ash { |
17 namespace tray { | 18 namespace tray { |
18 class AudioDetailedView; | 19 class AudioDetailedView; |
19 } | 20 } |
20 | 21 |
21 class ASH_EXPORT TrayAudioChromeOs | 22 class ASH_EXPORT TrayAudioChromeOs |
22 : public TrayAudio, | 23 : public TrayAudio, |
23 public chromeos::PowerManagerClient::Observer { | 24 public chromeos::PowerManagerClient::Observer { |
(...skipping 20 matching lines...) Expand all Loading... | |
44 void SuspendDone(const base::TimeDelta& sleep_duration) override; | 45 void SuspendDone(const base::TimeDelta& sleep_duration) override; |
45 | 46 |
46 tray::AudioDetailedView* audio_detail_view_; | 47 tray::AudioDetailedView* audio_detail_view_; |
47 | 48 |
48 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs); | 49 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs); |
49 }; | 50 }; |
50 | 51 |
51 } // namespace ash | 52 } // namespace ash |
52 | 53 |
53 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ | 54 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ |
OLD | NEW |