OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/system/audio/tray_audio.h" | 5 #include "ash/system/audio/tray_audio.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/display/display_manager.h" | |
10 #include "ash/metrics/user_metrics_recorder.h" | 11 #include "ash/metrics/user_metrics_recorder.h" |
11 #include "ash/shell.h" | 12 #include "ash/shell.h" |
12 #include "ash/system/audio/tray_audio_delegate.h" | 13 #include "ash/system/audio/tray_audio_delegate.h" |
13 #include "ash/system/audio/volume_view.h" | 14 #include "ash/system/audio/volume_view.h" |
14 #include "ash/system/tray/actionable_view.h" | 15 #include "ash/system/tray/actionable_view.h" |
15 #include "ash/system/tray/fixed_sized_scroll_view.h" | 16 #include "ash/system/tray/fixed_sized_scroll_view.h" |
16 #include "ash/system/tray/hover_highlight_view.h" | 17 #include "ash/system/tray/hover_highlight_view.h" |
17 #include "ash/system/tray/system_tray.h" | 18 #include "ash/system/tray/system_tray.h" |
18 #include "ash/system/tray/system_tray_delegate.h" | 19 #include "ash/system/tray/system_tray_delegate.h" |
19 #include "ash/system/tray/system_tray_notifier.h" | 20 #include "ash/system/tray/system_tray_notifier.h" |
20 #include "ash/system/tray/tray_constants.h" | 21 #include "ash/system/tray/tray_constants.h" |
21 #include "ash/volume_control_delegate.h" | 22 #include "ash/volume_control_delegate.h" |
22 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
23 #include "grit/ash_resources.h" | 24 #include "grit/ash_resources.h" |
24 #include "third_party/skia/include/core/SkCanvas.h" | 25 #include "third_party/skia/include/core/SkCanvas.h" |
25 #include "third_party/skia/include/core/SkPaint.h" | 26 #include "third_party/skia/include/core/SkPaint.h" |
26 #include "third_party/skia/include/core/SkRect.h" | 27 #include "third_party/skia/include/core/SkRect.h" |
27 #include "third_party/skia/include/effects/SkGradientShader.h" | 28 #include "third_party/skia/include/effects/SkGradientShader.h" |
28 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
30 #include "ui/gfx/display.h" | |
29 #include "ui/gfx/font_list.h" | 31 #include "ui/gfx/font_list.h" |
30 #include "ui/gfx/image/image.h" | 32 #include "ui/gfx/image/image.h" |
31 #include "ui/gfx/image/image_skia_operations.h" | 33 #include "ui/gfx/image/image_skia_operations.h" |
32 #include "ui/views/controls/button/image_button.h" | 34 #include "ui/views/controls/button/image_button.h" |
33 #include "ui/views/controls/image_view.h" | 35 #include "ui/views/controls/image_view.h" |
34 #include "ui/views/controls/label.h" | 36 #include "ui/views/controls/label.h" |
35 #include "ui/views/controls/slider.h" | 37 #include "ui/views/controls/slider.h" |
36 #include "ui/views/layout/box_layout.h" | 38 #include "ui/views/layout/box_layout.h" |
37 #include "ui/views/view.h" | 39 #include "ui/views/view.h" |
38 | 40 |
39 namespace ash { | 41 namespace ash { |
40 | 42 |
41 TrayAudio::TrayAudio(SystemTray* system_tray, | 43 TrayAudio::TrayAudio(SystemTray* system_tray, |
42 scoped_ptr<system::TrayAudioDelegate> audio_delegate) | 44 scoped_ptr<system::TrayAudioDelegate> audio_delegate) |
43 : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE), | 45 : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE), |
44 audio_delegate_(audio_delegate.Pass()), | 46 audio_delegate_(audio_delegate.Pass()), |
45 volume_view_(NULL), | 47 volume_view_(NULL), |
46 pop_up_volume_view_(false) { | 48 pop_up_volume_view_(false) { |
47 Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this); | 49 Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this); |
50 Shell::GetScreen()->AddObserver(this); | |
48 } | 51 } |
49 | 52 |
50 TrayAudio::~TrayAudio() { | 53 TrayAudio::~TrayAudio() { |
54 Shell::GetScreen()->RemoveObserver(this); | |
51 Shell::GetInstance()->system_tray_notifier()->RemoveAudioObserver(this); | 55 Shell::GetInstance()->system_tray_notifier()->RemoveAudioObserver(this); |
52 } | 56 } |
53 | 57 |
54 // static | 58 // static |
55 bool TrayAudio::ShowAudioDeviceMenu() { | 59 bool TrayAudio::ShowAudioDeviceMenu() { |
56 #if defined(OS_CHROMEOS) | 60 #if defined(OS_CHROMEOS) |
57 return true; | 61 return true; |
58 #else | 62 #else |
59 return false; | 63 return false; |
60 #endif | 64 #endif |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
120 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); | 124 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); |
121 } | 125 } |
122 } | 126 } |
123 | 127 |
124 void TrayAudio::OnAudioNodesChanged() { | 128 void TrayAudio::OnAudioNodesChanged() { |
125 Update(); | 129 Update(); |
126 } | 130 } |
127 | 131 |
128 void TrayAudio::OnActiveOutputNodeChanged() { | 132 void TrayAudio::OnActiveOutputNodeChanged() { |
129 Update(); | 133 Update(); |
134 ChangeAudioChannelMode(); | |
130 } | 135 } |
131 | 136 |
132 void TrayAudio::OnActiveInputNodeChanged() { | 137 void TrayAudio::OnActiveInputNodeChanged() { |
133 Update(); | 138 Update(); |
134 } | 139 } |
135 | 140 |
141 void TrayAudio::OnDisplayAdded(const gfx::Display& new_display) { | |
142 } | |
143 | |
144 void TrayAudio::OnDisplayRemoved(const gfx::Display& old_display) { | |
145 } | |
146 | |
147 void TrayAudio::OnDisplayMetricsChanged(const gfx::Display& display, | |
148 uint32_t changed_metrics) { | |
149 if (display.id() != gfx::Display::InternalDisplayId()) | |
150 return; | |
151 | |
152 if (changed_metrics & gfx::DisplayObserver::DISPLAY_METRIC_ROTATION) | |
153 ChangeAudioChannelMode(); | |
154 } | |
155 | |
156 void TrayAudio::ChangeAudioChannelMode() { | |
157 // Swap left/right channel if it is in Yoga mode. | |
158 const DisplayInfo& display_info = | |
159 Shell::GetInstance()->display_manager()->GetDisplayInfo( | |
160 gfx::Display::InternalDisplayId()); | |
oshima
2014/10/01 00:45:52
you should check if there is internal display (==
flackr
2014/10/01 17:25:28
In which case we should call this from OnDisplayRe
jennyz
2014/10/01 17:43:53
Done.
jennyz
2014/10/01 17:43:54
Done.
| |
161 audio_delegate_->SetAudioChannelMode( | |
162 display_info.rotation() == gfx::Display::ROTATE_180 | |
163 ? system::TrayAudioDelegate::LEFT_RIGHT_SWAPPED | |
164 : system::TrayAudioDelegate::NORMAL); | |
165 } | |
166 | |
136 void TrayAudio::Update() { | 167 void TrayAudio::Update() { |
137 if (tray_view()) | 168 if (tray_view()) |
138 tray_view()->SetVisible(GetInitialVisibility()); | 169 tray_view()->SetVisible(GetInitialVisibility()); |
139 if (volume_view_) { | 170 if (volume_view_) { |
140 volume_view_->SetVolumeLevel( | 171 volume_view_->SetVolumeLevel( |
141 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); | 172 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); |
142 volume_view_->Update(); | 173 volume_view_->Update(); |
143 } | 174 } |
144 } | 175 } |
145 | 176 |
146 } // namespace ash | 177 } // namespace ash |
OLD | NEW |