chromeos: Combine TrayAudio and TrayAudioChromeOs classes

ash/common/system/chromeos/audio/volume_view.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/slider.h"
 
 namespace views {
 class View;
 class ImageView;
 class Separator;
 class Slider;
 }
 
 namespace ash {
 class SystemTrayItem;
 
 namespace system {
 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,
              bool is_default_view);
 
   ~VolumeView() override;
 
   void Update();
 
   // Sets volume level on slider_, |percent| is ranged from [0.00] to [1.00].
@@ skipping 27 matching lines @@
   views::ImageView* device_type_;
   views::ImageView* more_;
   bool is_default_view_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeView);
 };
 
 }  // namespace tray
 }  // namespace ash
 
-#endif  // ASH_COMMON_SYSTEM_AUDIO_VOLUME_VIEW_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_VOLUME_VIEW_H_