mash: Migrate tray audio and deps to common.

ash/common/system/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/system/audio/volume_view.h"
+#include "ash/common/system/audio/volume_view.h"
 
 #include "ash/common/ash_constants.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/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/shell.h"
-#include "ash/system/audio/tray_audio.h"
-#include "ash/system/audio/tray_audio_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/separator.h"
@@ skipping 221 matching lines @@
                                     float value,
                                     float old_value,
                                     views::SliderChangeReason reason) {
   if (reason == views::VALUE_CHANGED_BY_USER) {
     float new_volume = value * 100.0f;
     float current_volume = audio_delegate_->GetOutputVolumeLevel();
     // Do not call change audio volume if the difference is less than
     // 1%, which is beyond cras audio api's granularity for output volume.
     if (std::abs(new_volume - current_volume) < 1.0f)
       return;
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         is_default_view_ ?
         ash::UMA_STATUS_AREA_CHANGED_VOLUME_MENU :

[James Cook, 2016/06/22 21:27:24]

nit: Can you take these out of namespace ash:: while you're here?

[msw, 2016/06/22 22:16:11]

Done.

         ash::UMA_STATUS_AREA_CHANGED_VOLUME_POPUP);
     if (new_volume > current_volume)
       HandleVolumeUp(new_volume);
     else
       HandleVolumeDown(new_volume);
   }
   icon_->Update();
 }
 
 bool VolumeView::PerformAction(const ui::Event& event) {
@@ skipping 10 matching lines @@
   separator_->SetSize(gfx::Size(kSeparatorSize, bounds().height()));
 }
 
 void VolumeView::GetAccessibleState(ui::AXViewState* state) {
   // Intentionally overrides ActionableView, leaving |state| unset. A slider
   // childview exposes accessibility data.
 }
 
 }  // namespace tray
 }  // namespace ash