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 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
| 11 #include "ash/common/volume_control_delegate.h" |
11 #include "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
12 #include "ash/metrics/user_metrics_recorder.h" | 13 #include "ash/metrics/user_metrics_recorder.h" |
13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
14 #include "ash/system/audio/tray_audio_delegate.h" | 15 #include "ash/system/audio/tray_audio_delegate.h" |
15 #include "ash/system/audio/volume_view.h" | 16 #include "ash/system/audio/volume_view.h" |
16 #include "ash/system/tray/actionable_view.h" | 17 #include "ash/system/tray/actionable_view.h" |
17 #include "ash/system/tray/fixed_sized_scroll_view.h" | 18 #include "ash/system/tray/fixed_sized_scroll_view.h" |
18 #include "ash/system/tray/hover_highlight_view.h" | 19 #include "ash/system/tray/hover_highlight_view.h" |
19 #include "ash/system/tray/system_tray.h" | 20 #include "ash/system/tray/system_tray.h" |
20 #include "ash/system/tray/system_tray_delegate.h" | 21 #include "ash/system/tray/system_tray_delegate.h" |
21 #include "ash/system/tray/system_tray_notifier.h" | 22 #include "ash/system/tray/system_tray_notifier.h" |
22 #include "ash/system/tray/tray_constants.h" | 23 #include "ash/system/tray/tray_constants.h" |
23 #include "ash/volume_control_delegate.h" | |
24 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
25 #include "grit/ash_resources.h" | 25 #include "grit/ash_resources.h" |
26 #include "third_party/skia/include/core/SkCanvas.h" | 26 #include "third_party/skia/include/core/SkCanvas.h" |
27 #include "third_party/skia/include/core/SkPaint.h" | 27 #include "third_party/skia/include/core/SkPaint.h" |
28 #include "third_party/skia/include/core/SkRect.h" | 28 #include "third_party/skia/include/core/SkRect.h" |
29 #include "third_party/skia/include/effects/SkGradientShader.h" | 29 #include "third_party/skia/include/effects/SkGradientShader.h" |
30 #include "ui/display/display.h" | 30 #include "ui/display/display.h" |
31 #include "ui/gfx/canvas.h" | 31 #include "ui/gfx/canvas.h" |
32 #include "ui/gfx/font_list.h" | 32 #include "ui/gfx/font_list.h" |
33 #include "ui/gfx/image/image.h" | 33 #include "ui/gfx/image/image.h" |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 if (tray_view()) | 179 if (tray_view()) |
180 tray_view()->SetVisible(GetInitialVisibility()); | 180 tray_view()->SetVisible(GetInitialVisibility()); |
181 if (volume_view_) { | 181 if (volume_view_) { |
182 volume_view_->SetVolumeLevel( | 182 volume_view_->SetVolumeLevel( |
183 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); | 183 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); |
184 volume_view_->Update(); | 184 volume_view_->Update(); |
185 } | 185 } |
186 } | 186 } |
187 | 187 |
188 } // namespace ash | 188 } // namespace ash |
OLD | NEW |