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/strings/grit/ash_strings.h" | 12 #include "ash/strings/grit/ash_strings.h" |
12 #include "ash/system/tray/actionable_view.h" | 13 #include "ash/system/tray/actionable_view.h" |
13 #include "ash/system/tray/system_tray_item.h" | 14 #include "ash/system/tray/system_tray_item.h" |
14 #include "ash/system/tray/tray_constants.h" | 15 #include "ash/system/tray/tray_constants.h" |
15 #include "ash/system/tray/tray_popup_utils.h" | 16 #include "ash/system/tray/tray_popup_utils.h" |
16 #include "ash/system/tray/tri_view.h" | 17 #include "ash/system/tray/tri_view.h" |
17 #include "ash/wm_shell.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/views/background.h" | 23 #include "ui/views/background.h" |
24 #include "ui/views/border.h" | 24 #include "ui/views/border.h" |
25 #include "ui/views/controls/button/custom_button.h" | 25 #include "ui/views/controls/button/custom_button.h" |
26 #include "ui/views/controls/image_view.h" | 26 #include "ui/views/controls/image_view.h" |
27 #include "ui/views/controls/slider.h" | 27 #include "ui/views/controls/slider.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 | 241 |
242 void VolumeView::SliderValueChanged(views::Slider* sender, | 242 void VolumeView::SliderValueChanged(views::Slider* sender, |
243 float value, | 243 float value, |
244 float old_value, | 244 float old_value, |
245 views::SliderChangeReason reason) { | 245 views::SliderChangeReason reason) { |
246 if (reason == views::VALUE_CHANGED_BY_USER) { | 246 if (reason == views::VALUE_CHANGED_BY_USER) { |
247 int new_volume = static_cast<int>(value * 100); | 247 int new_volume = static_cast<int>(value * 100); |
248 int current_volume = CrasAudioHandler::Get()->GetOutputVolumePercent(); | 248 int current_volume = CrasAudioHandler::Get()->GetOutputVolumePercent(); |
249 if (new_volume == current_volume) | 249 if (new_volume == current_volume) |
250 return; | 250 return; |
251 WmShell::Get()->RecordUserMetricsAction( | 251 ShellPort::Get()->RecordUserMetricsAction( |
252 is_default_view_ ? UMA_STATUS_AREA_CHANGED_VOLUME_MENU | 252 is_default_view_ ? UMA_STATUS_AREA_CHANGED_VOLUME_MENU |
253 : UMA_STATUS_AREA_CHANGED_VOLUME_POPUP); | 253 : UMA_STATUS_AREA_CHANGED_VOLUME_POPUP); |
254 if (new_volume > current_volume) | 254 if (new_volume > current_volume) |
255 HandleVolumeUp(new_volume); | 255 HandleVolumeUp(new_volume); |
256 else | 256 else |
257 HandleVolumeDown(new_volume); | 257 HandleVolumeDown(new_volume); |
258 } | 258 } |
259 icon_->Update(); | 259 icon_->Update(); |
260 } | 260 } |
261 | 261 |
262 } // namespace tray | 262 } // namespace tray |
263 } // namespace ash | 263 } // namespace ash |
OLD | NEW |