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