| Index: ash/common/system/chromeos/audio/volume_view.h
|
| diff --git a/ash/common/system/audio/volume_view.h b/ash/common/system/chromeos/audio/volume_view.h
|
| similarity index 88%
|
| rename from ash/common/system/audio/volume_view.h
|
| rename to ash/common/system/chromeos/audio/volume_view.h
|
| index 3eba8b5705930cb938b17138a9be71d226a35f5c..6e4b428b204750bfea8d0cd0750ce6b928ead7ce 100644
|
| --- a/ash/common/system/audio/volume_view.h
|
| +++ b/ash/common/system/chromeos/audio/volume_view.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
|
| -#define ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
|
| +#ifndef ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_
|
| +#define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_
|
|
|
| #include "ash/common/system/tray/actionable_view.h"
|
| #include "base/macros.h"
|
| @@ -28,8 +28,7 @@ class TrayAudioDelegate;
|
| namespace tray {
|
| class VolumeButton;
|
|
|
| -class VolumeView : public ActionableView,
|
| - public views::SliderListener {
|
| +class VolumeView : public ActionableView, public views::SliderListener {
|
| public:
|
| VolumeView(SystemTrayItem* owner,
|
| system::TrayAudioDelegate* audio_delegate,
|
| @@ -77,4 +76,4 @@ class VolumeView : public ActionableView,
|
| } // namespace tray
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
|
| +#endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_
|
|
|