Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2174)

Unified Diff: ash/common/system/audio/volume_view.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup IWYU. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/audio/volume_view.cc
diff --git a/ash/system/audio/volume_view.cc b/ash/common/system/audio/volume_view.cc
similarity index 97%
rename from ash/system/audio/volume_view.cc
rename to ash/common/system/audio/volume_view.cc
index b83600b2a408d0cc2b280e2a9f9750c620f20c53..d0a58b4d38d9830d3e648d45cd1cc67ae20bdc77 100644
--- a/ash/system/audio/volume_view.cc
+++ b/ash/common/system/audio/volume_view.cc
@@ -2,15 +2,16 @@
// 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"
@@ -252,7 +253,7 @@ void VolumeView::SliderValueChanged(views::Slider* sender,
// 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:: whi
msw 2016/06/22 22:16:11 Done.
ash::UMA_STATUS_AREA_CHANGED_VOLUME_POPUP);

Powered by Google App Engine
This is Rietveld 408576698