chromeos: Combine TrayAudio and TrayAudioChromeOs classes

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

 // 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.
 
-#include "ash/common/system/audio/volume_view.h"
+#include "ash/common/system/chromeos/audio/volume_view.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.h"
-#include "ash/common/system/audio/tray_audio.h"
-#include "ash/common/system/audio/tray_audio_delegate.h"
+#include "ash/common/system/chromeos/audio/tray_audio_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 210 matching lines @@
     return;
   slider_->SetValue(percent);
   // It is possible that the volume was (un)muted, but the actual volume level
   // did not change. In that case, setting the value of the slider won't
   // trigger an update. So explicitly trigger an update.
   Update();
   slider_->set_enable_accessibility_events(true);
 }
 
 void VolumeView::UpdateDeviceTypeAndMore() {
-  bool show_more = is_default_view_ && TrayAudio::ShowAudioDeviceMenu() &&
-                   audio_delegate_->HasAlternativeSources();
+  bool show_more = is_default_view_ && audio_delegate_->HasAlternativeSources();
   if (!ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
     slider_->SetBorder(views::CreateEmptyBorder(
         0, 0, 0, show_more ? kTrayPopupPaddingBetweenItems
                            : kSliderRightPaddingToVolumeViewEdge));
   }
   if (!show_more) {
     more_region_->SetVisible(false);
     return;
   }
 
@@ skipping 92 matching lines @@
   separator_->SetSize(gfx::Size(kSeparatorSize, bounds().height()));
 }
 
 void VolumeView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   // Intentionally overrides ActionableView, leaving |state| unset. A slider
   // childview exposes accessibility data.
 }
 
 }  // namespace tray
 }  // namespace ash