| 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_AUDIO_TRAY_AUDIO_H_ | 5 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ |
| 6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ | 6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include "ash/system/audio/audio_observer.h" | 10 #include "ash/system/audio/audio_observer.h" |
| 9 #include "ash/system/tray/tray_image_item.h" | 11 #include "ash/system/tray/tray_image_item.h" |
| 12 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 11 #include "ui/gfx/display_observer.h" | 14 #include "ui/gfx/display_observer.h" |
| 12 | 15 |
| 13 namespace ash { | 16 namespace ash { |
| 14 | 17 |
| 15 namespace system { | 18 namespace system { |
| 16 class TrayAudioDelegate; | 19 class TrayAudioDelegate; |
| 17 } | 20 } |
| 18 | 21 |
| 19 namespace tray { | 22 namespace tray { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 void OnActiveInputNodeChanged() override; | 69 void OnActiveInputNodeChanged() override; |
| 67 | 70 |
| 68 void ChangeInternalSpeakerChannelMode(); | 71 void ChangeInternalSpeakerChannelMode(); |
| 69 | 72 |
| 70 DISALLOW_COPY_AND_ASSIGN(TrayAudio); | 73 DISALLOW_COPY_AND_ASSIGN(TrayAudio); |
| 71 }; | 74 }; |
| 72 | 75 |
| 73 } // namespace ash | 76 } // namespace ash |
| 74 | 77 |
| 75 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ | 78 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1540753002:
Switch to standard integer types in ash/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master