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/volume_view.h" | 5 #include "ash/system/audio/volume_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/metrics/user_metrics_action.h" | 9 #include "ash/metrics/user_metrics_action.h" |
10 #include "ash/resources/vector_icons/vector_icons.h" | 10 #include "ash/resources/vector_icons/vector_icons.h" |
11 #include "ash/shell_port.h" | 11 #include "ash/shell_port.h" |
12 #include "ash/strings/grit/ash_strings.h" | 12 #include "ash/strings/grit/ash_strings.h" |
13 #include "ash/system/tray/actionable_view.h" | 13 #include "ash/system/tray/actionable_view.h" |
14 #include "ash/system/tray/system_tray_item.h" | 14 #include "ash/system/tray/system_tray_item.h" |
15 #include "ash/system/tray/tray_constants.h" | 15 #include "ash/system/tray/tray_constants.h" |
16 #include "ash/system/tray/tray_popup_utils.h" | 16 #include "ash/system/tray/tray_popup_utils.h" |
17 #include "ash/system/tray/tri_view.h" | 17 #include "ash/system/tray/tri_view.h" |
18 #include "chromeos/audio/cras_audio_handler.h" | 18 #include "chromeos/audio/cras_audio_handler.h" |
19 #include "ui/accessibility/ax_node_data.h" | 19 #include "ui/accessibility/ax_node_data.h" |
20 #include "ui/base/l10n/l10n_util.h" | 20 #include "ui/base/l10n/l10n_util.h" |
21 #include "ui/gfx/paint_vector_icon.h" | 21 #include "ui/gfx/paint_vector_icon.h" |
22 #include "ui/gfx/vector_icon_types.h" | 22 #include "ui/gfx/vector_icon_types.h" |
| 23 #include "ui/native_theme/native_theme.h" |
23 #include "ui/views/background.h" | 24 #include "ui/views/background.h" |
24 #include "ui/views/border.h" | 25 #include "ui/views/border.h" |
25 #include "ui/views/controls/button/custom_button.h" | 26 #include "ui/views/controls/button/custom_button.h" |
26 #include "ui/views/controls/image_view.h" | 27 #include "ui/views/controls/image_view.h" |
27 #include "ui/views/controls/slider.h" | 28 #include "ui/views/controls/slider.h" |
28 #include "ui/views/layout/fill_layout.h" | 29 #include "ui/views/layout/fill_layout.h" |
29 | 30 |
30 using chromeos::CrasAudioHandler; | 31 using chromeos::CrasAudioHandler; |
31 | 32 |
32 namespace ash { | 33 namespace ash { |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 | 124 |
124 icon_ = new VolumeButton(owner, this); | 125 icon_ = new VolumeButton(owner, this); |
125 tri_view_->AddView(TriView::Container::START, icon_); | 126 tri_view_->AddView(TriView::Container::START, icon_); |
126 | 127 |
127 slider_ = TrayPopupUtils::CreateSlider(this); | 128 slider_ = TrayPopupUtils::CreateSlider(this); |
128 slider_->SetValue(CrasAudioHandler::Get()->GetOutputVolumePercent() / 100.0f); | 129 slider_->SetValue(CrasAudioHandler::Get()->GetOutputVolumePercent() / 100.0f); |
129 slider_->SetAccessibleName( | 130 slider_->SetAccessibleName( |
130 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VOLUME)); | 131 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VOLUME)); |
131 tri_view_->AddView(TriView::Container::CENTER, slider_); | 132 tri_view_->AddView(TriView::Container::CENTER, slider_); |
132 | 133 |
133 set_background(views::Background::CreateSolidBackground(kBackgroundColor)); | 134 set_background(views::Background::CreateThemedSolidBackground( |
| 135 this, ui::NativeTheme::kColorId_BubbleBackground)); |
| 136 |
134 Update(); | 137 Update(); |
135 } | 138 } |
136 | 139 |
137 VolumeView::~VolumeView() {} | 140 VolumeView::~VolumeView() {} |
138 | 141 |
139 void VolumeView::Update() { | 142 void VolumeView::Update() { |
140 icon_->Update(); | 143 icon_->Update(); |
141 slider_->UpdateState(!CrasAudioHandler::Get()->IsOutputMuted()); | 144 slider_->UpdateState(!CrasAudioHandler::Get()->IsOutputMuted()); |
142 UpdateDeviceTypeAndMore(); | 145 UpdateDeviceTypeAndMore(); |
143 Layout(); | 146 Layout(); |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 if (new_volume > current_volume) | 274 if (new_volume > current_volume) |
272 HandleVolumeUp(new_volume); | 275 HandleVolumeUp(new_volume); |
273 else | 276 else |
274 HandleVolumeDown(new_volume); | 277 HandleVolumeDown(new_volume); |
275 } | 278 } |
276 icon_->Update(); | 279 icon_->Update(); |
277 } | 280 } |
278 | 281 |
279 } // namespace tray | 282 } // namespace tray |
280 } // namespace ash | 283 } // namespace ash |
OLD | NEW |