| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_VOLUME_H_ | 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_VOLUME_H_ |
| 6 #define ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ | 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_VOLUME_H_ |
| 7 | 7 |
| 8 #include "ash/system/audio/audio_observer.h" | 8 #include "ash/system/chromeos/audio/audio_observer.h" |
| 9 #include "ash/system/tray/tray_image_item.h" | 9 #include "ash/system/tray/tray_image_item.h" |
| 10 | 10 |
| 11 namespace ash { | 11 namespace ash { |
| 12 namespace internal { | 12 namespace internal { |
| 13 | 13 |
| 14 namespace tray { | 14 namespace tray { |
| 15 class VolumeView; | 15 class VolumeView; |
| 16 } | 16 } |
| 17 | 17 |
| 18 class TrayVolume : public TrayImageItem, | 18 class TrayVolume : public TrayImageItem, |
| (...skipping 24 matching lines...) Expand all Loading... |
| 43 // CreateDetailedView()? Used to avoid resetting |volume_view_| | 43 // CreateDetailedView()? Used to avoid resetting |volume_view_| |
| 44 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). | 44 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). |
| 45 bool is_default_view_; | 45 bool is_default_view_; |
| 46 | 46 |
| 47 DISALLOW_COPY_AND_ASSIGN(TrayVolume); | 47 DISALLOW_COPY_AND_ASSIGN(TrayVolume); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 } // namespace internal | 50 } // namespace internal |
| 51 } // namespace ash | 51 } // namespace ash |
| 52 | 52 |
| 53 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ | 53 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_VOLUME_H_ |
| OLD | NEW |