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

Unified Diff: ash/system/chromeos/audio/tray_audio_chromeos.cc

Issue 165393013: Resubmit 'Refactor the TrayAudio code so that it can be used by other platforms.' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 6 years, 10 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/system/chromeos/audio/tray_audio_chromeos.cc
diff --git a/ash/system/chromeos/audio/tray_audio_chromeos.cc b/ash/system/chromeos/audio/tray_audio_chromeos.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f80d7124677eaed17f303f7b73a8ccd207338c1b
--- /dev/null
+++ b/ash/system/chromeos/audio/tray_audio_chromeos.cc
@@ -0,0 +1,61 @@
+// 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/chromeos/audio/tray_audio_chromeos.h"
+
+#include "ash/ash_switches.h"
+#include "ash/metrics/user_metrics_recorder.h"
+#include "ash/shell.h"
+#include "ash/system/audio/volume_view.h"
+#include "ash/system/chromeos/audio/audio_detailed_view.h"
+#include "ash/system/chromeos/audio/tray_audio_delegate_chromeos.h"
+#include "ui/views/view.h"
+
+namespace ash {
+
+using system::TrayAudioDelegate;
+using system::TrayAudioDelegateChromeOs;
+
+namespace internal {
+
+TrayAudioChromeOs::TrayAudioChromeOs(SystemTray* system_tray)
+ : TrayAudio(system_tray,
+ scoped_ptr<TrayAudioDelegate>(new TrayAudioDelegateChromeOs())),
+ audio_detail_view_(NULL) {
+}
+
+TrayAudioChromeOs::~TrayAudioChromeOs() {
+}
+
+void TrayAudioChromeOs::Update() {
+ TrayAudio::Update();
+
+ if (audio_detail_view_)
+ audio_detail_view_->Update();
+}
+
+views::View* TrayAudioChromeOs::CreateDetailedView(user::LoginStatus status) {
+ if (!ash::switches::ShowAudioDeviceMenu() || pop_up_volume_view_) {
+ volume_view_ = new tray::VolumeView(this, audio_delegate_.get(), false);
+ return volume_view_;
+ } else {
+ Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+ ash::UMA_STATUS_AREA_DETAILED_AUDIO_VIEW);
+ audio_detail_view_ =
+ new tray::AudioDetailedView(this, status);
+ return audio_detail_view_;
+ }
+}
+
+void TrayAudioChromeOs::DestroyDetailedView() {
+ if (audio_detail_view_) {
+ audio_detail_view_ = NULL;
+ } else if (volume_view_) {
+ volume_view_ = NULL;
+ pop_up_volume_view_ = false;
+ }
+}
+
+} // namespace internal
+} // namespace ash
« no previous file with comments | « ash/system/chromeos/audio/tray_audio_chromeos.h ('k') | ash/system/chromeos/audio/tray_audio_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698