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

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

Issue 2483393002: chromeos: Combine TrayAudio and TrayAudioChromeOs classes (Closed)
Patch Set: rebase Created 4 years, 1 month 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
« no previous file with comments | « ash/common/system/chromeos/audio/volume_view.h ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/audio/volume_view.cc
diff --git a/ash/common/system/audio/volume_view.cc b/ash/common/system/chromeos/audio/volume_view.cc
similarity index 97%
rename from ash/common/system/audio/volume_view.cc
rename to ash/common/system/chromeos/audio/volume_view.cc
index d3818723dbef15cf271f72bd2c96dc53bffb3285..38d050b98627ee8bf140e19c4b6c52997c91cb1a 100644
--- a/ash/common/system/audio/volume_view.cc
+++ b/ash/common/system/chromeos/audio/volume_view.cc
@@ -2,14 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <algorithm>
+#include "ash/common/system/chromeos/audio/volume_view.h"
-#include "ash/common/system/audio/volume_view.h"
+#include <algorithm>
#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/actionable_view.h"
#include "ash/common/system/tray/system_tray_item.h"
#include "ash/common/system/tray/tray_constants.h"
@@ -243,8 +242,7 @@ void VolumeView::SetVolumeLevel(float percent) {
}
void VolumeView::UpdateDeviceTypeAndMore() {
- bool show_more = is_default_view_ && TrayAudio::ShowAudioDeviceMenu() &&
- audio_delegate_->HasAlternativeSources();
+ bool show_more = is_default_view_ && audio_delegate_->HasAlternativeSources();
if (!show_more)
return;
« no previous file with comments | « ash/common/system/chromeos/audio/volume_view.h ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698