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/common/metrics/user_metrics_action.h" | 9 #include "ash/metrics/user_metrics_action.h" |
10 #include "ash/common/wm_shell.h" | |
11 #include "ash/resources/vector_icons/vector_icons.h" | 10 #include "ash/resources/vector_icons/vector_icons.h" |
12 #include "ash/strings/grit/ash_strings.h" | 11 #include "ash/strings/grit/ash_strings.h" |
13 #include "ash/system/audio/tray_audio_delegate.h" | 12 #include "ash/system/audio/tray_audio_delegate.h" |
14 #include "ash/system/tray/actionable_view.h" | 13 #include "ash/system/tray/actionable_view.h" |
15 #include "ash/system/tray/system_tray_item.h" | 14 #include "ash/system/tray/system_tray_item.h" |
16 #include "ash/system/tray/tray_constants.h" | 15 #include "ash/system/tray/tray_constants.h" |
17 #include "ash/system/tray/tray_popup_item_container.h" | 16 #include "ash/system/tray/tray_popup_item_container.h" |
18 #include "ash/system/tray/tray_popup_utils.h" | 17 #include "ash/system/tray/tray_popup_utils.h" |
19 #include "ash/system/tray/tri_view.h" | 18 #include "ash/system/tray/tri_view.h" |
| 19 #include "ash/wm_shell.h" |
20 #include "ui/accessibility/ax_node_data.h" | 20 #include "ui/accessibility/ax_node_data.h" |
21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
22 #include "ui/gfx/paint_vector_icon.h" | 22 #include "ui/gfx/paint_vector_icon.h" |
23 #include "ui/gfx/vector_icon_types.h" | 23 #include "ui/gfx/vector_icon_types.h" |
24 #include "ui/views/background.h" | 24 #include "ui/views/background.h" |
25 #include "ui/views/border.h" | 25 #include "ui/views/border.h" |
26 #include "ui/views/controls/button/custom_button.h" | 26 #include "ui/views/controls/button/custom_button.h" |
27 #include "ui/views/controls/image_view.h" | 27 #include "ui/views/controls/image_view.h" |
28 #include "ui/views/controls/slider.h" | 28 #include "ui/views/controls/slider.h" |
29 #include "ui/views/layout/fill_layout.h" | 29 #include "ui/views/layout/fill_layout.h" |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 if (new_volume > current_volume) | 239 if (new_volume > current_volume) |
240 HandleVolumeUp(new_volume); | 240 HandleVolumeUp(new_volume); |
241 else | 241 else |
242 HandleVolumeDown(new_volume); | 242 HandleVolumeDown(new_volume); |
243 } | 243 } |
244 icon_->Update(); | 244 icon_->Update(); |
245 } | 245 } |
246 | 246 |
247 } // namespace tray | 247 } // namespace tray |
248 } // namespace ash | 248 } // namespace ash |
OLD | NEW |