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

Unified Diff: ash/system/audio/tray_audio.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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
« no previous file with comments | « ash/system/audio/tray_audio.h ('k') | ash/system/audio/tray_audio_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/audio/tray_audio.cc
diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc
deleted file mode 100644
index 85af7e98a5235ed856bccc70c3471753a81d7b6c..0000000000000000000000000000000000000000
--- a/ash/system/audio/tray_audio.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-// 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/tray_audio.h"
-
-#include <cmath>
-#include <utility>
-
-#include "ash/common/ash_constants.h"
-#include "ash/common/system/tray/actionable_view.h"
-#include "ash/common/system/tray/fixed_sized_scroll_view.h"
-#include "ash/common/system/tray/hover_highlight_view.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/volume_control_delegate.h"
-#include "ash/display/display_manager.h"
-#include "ash/metrics/user_metrics_recorder.h"
-#include "ash/shell.h"
-#include "ash/system/audio/tray_audio_delegate.h"
-#include "ash/system/audio/volume_view.h"
-#include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
-#include "base/strings/utf_string_conversions.h"
-#include "grit/ash_resources.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/include/effects/SkGradientShader.h"
-#include "ui/display/display.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/font_list.h"
-#include "ui/gfx/image/image.h"
-#include "ui/gfx/image/image_skia_operations.h"
-#include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/controls/slider.h"
-#include "ui/views/layout/box_layout.h"
-#include "ui/views/view.h"
-
-namespace ash {
-
-TrayAudio::TrayAudio(SystemTray* system_tray,
- std::unique_ptr<system::TrayAudioDelegate> audio_delegate)
- : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE),
- audio_delegate_(std::move(audio_delegate)),
- volume_view_(NULL),
- pop_up_volume_view_(false) {
- Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this);
- display::Screen::GetScreen()->AddObserver(this);
-}
-
-TrayAudio::~TrayAudio() {
- display::Screen::GetScreen()->RemoveObserver(this);
- Shell::GetInstance()->system_tray_notifier()->RemoveAudioObserver(this);
-}
-
-// static
-bool TrayAudio::ShowAudioDeviceMenu() {
-#if defined(OS_CHROMEOS)
- return true;
-#else
- return false;
-#endif
-}
-
-bool TrayAudio::GetInitialVisibility() {
- return audio_delegate_->IsOutputAudioMuted();
-}
-
-views::View* TrayAudio::CreateDefaultView(LoginStatus status) {
- volume_view_ = new tray::VolumeView(this, audio_delegate_.get(), true);
- return volume_view_;
-}
-
-views::View* TrayAudio::CreateDetailedView(LoginStatus status) {
- volume_view_ = new tray::VolumeView(this, audio_delegate_.get(), false);
- return volume_view_;
-}
-
-void TrayAudio::DestroyDefaultView() {
- volume_view_ = NULL;
-}
-
-void TrayAudio::DestroyDetailedView() {
- if (volume_view_) {
- volume_view_ = NULL;
- pop_up_volume_view_ = false;
- }
-}
-
-bool TrayAudio::ShouldHideArrow() const {
- return true;
-}
-
-bool TrayAudio::ShouldShowShelf() const {
- return TrayAudio::ShowAudioDeviceMenu() && !pop_up_volume_view_;
-}
-
-void TrayAudio::OnOutputNodeVolumeChanged(uint64_t /* node_id */,
- double /* volume */) {
- float percent =
- static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f;
- if (tray_view())
- tray_view()->SetVisible(GetInitialVisibility());
-
- if (volume_view_) {
- volume_view_->SetVolumeLevel(percent);
- SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
- return;
- }
- pop_up_volume_view_ = true;
- PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
-}
-
-void TrayAudio::OnOutputMuteChanged(bool /* mute_on */, bool system_adjust) {
- if (tray_view())
- tray_view()->SetVisible(GetInitialVisibility());
-
- if (volume_view_) {
- volume_view_->Update();
- SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
- } else if (!system_adjust) {
- pop_up_volume_view_ = true;
- PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
- }
-}
-
-void TrayAudio::OnAudioNodesChanged() {
- Update();
-}
-
-void TrayAudio::OnActiveOutputNodeChanged() {
- Update();
-}
-
-void TrayAudio::OnActiveInputNodeChanged() {
- Update();
-}
-
-void TrayAudio::ChangeInternalSpeakerChannelMode() {
- // Swap left/right channel only if it is in Yoga mode.
- system::TrayAudioDelegate::AudioChannelMode channel_mode =
- system::TrayAudioDelegate::NORMAL;
- if (display::Display::HasInternalDisplay()) {
- const DisplayInfo& display_info =
- Shell::GetInstance()->display_manager()->GetDisplayInfo(
- display::Display::InternalDisplayId());
- if (display_info.GetActiveRotation() == display::Display::ROTATE_180)
- channel_mode = system::TrayAudioDelegate::LEFT_RIGHT_SWAPPED;
- }
-
- audio_delegate_->SetInternalSpeakerChannelMode(channel_mode);
-}
-
-void TrayAudio::OnDisplayAdded(const display::Display& new_display) {
- if (!new_display.IsInternal())
- return;
- ChangeInternalSpeakerChannelMode();
-}
-
-void TrayAudio::OnDisplayRemoved(const display::Display& old_display) {
- if (!old_display.IsInternal())
- return;
- ChangeInternalSpeakerChannelMode();
-}
-
-void TrayAudio::OnDisplayMetricsChanged(const display::Display& display,
- uint32_t changed_metrics) {
- if (!display.IsInternal())
- return;
-
- if (changed_metrics & display::DisplayObserver::DISPLAY_METRIC_ROTATION)
- ChangeInternalSpeakerChannelMode();
-}
-
-void TrayAudio::Update() {
- if (tray_view())
- tray_view()->SetVisible(GetInitialVisibility());
- if (volume_view_) {
- volume_view_->SetVolumeLevel(
- static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
- volume_view_->Update();
- }
-}
-
-} // namespace ash
« no previous file with comments | « ash/system/audio/tray_audio.h ('k') | ash/system/audio/tray_audio_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698