| 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 #ifndef ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ | 5 #ifndef ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ |
| 6 #define ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ | 6 #define ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ |
| 7 | 7 |
| 8 #include "ash/system/tray/actionable_view.h" | 8 #include "ash/system/tray/actionable_view.h" |
| 9 #include "ui/gfx/font.h" | 9 #include "ui/gfx/font.h" |
| 10 #include "ui/views/controls/button/button.h" | 10 #include "ui/views/controls/button/button.h" |
| 11 #include "ui/views/controls/slider.h" | 11 #include "ui/views/controls/slider.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 class View; | 14 class View; |
| 15 class ImageView; | 15 class ImageView; |
| 16 } | 16 } |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 | 19 class HoverHighlightView; |
| 20 class SystemTrayItem; | 20 class SystemTrayItem; |
| 21 | 21 |
| 22 namespace system { | 22 namespace system { |
| 23 class TrayAudioDelegate; | 23 class TrayAudioDelegate; |
| 24 } | 24 } |
| 25 | 25 |
| 26 namespace internal { | |
| 27 | |
| 28 class HoverHighlightView; | |
| 29 | |
| 30 namespace tray { | 26 namespace tray { |
| 31 | |
| 32 class BarSeparator; | 27 class BarSeparator; |
| 33 class VolumeButton; | 28 class VolumeButton; |
| 34 class VolumeSlider; | 29 class VolumeSlider; |
| 35 | 30 |
| 36 class VolumeView : public ActionableView, | 31 class VolumeView : public ActionableView, |
| 37 public views::ButtonListener, | 32 public views::ButtonListener, |
| 38 public views::SliderListener { | 33 public views::SliderListener { |
| 39 public: | 34 public: |
| 40 VolumeView(SystemTrayItem* owner, | 35 VolumeView(SystemTrayItem* owner, |
| 41 system::TrayAudioDelegate* audio_delegate, | 36 system::TrayAudioDelegate* audio_delegate, |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 VolumeSlider* slider_; | 71 VolumeSlider* slider_; |
| 77 BarSeparator* bar_; | 72 BarSeparator* bar_; |
| 78 views::ImageView* device_type_; | 73 views::ImageView* device_type_; |
| 79 views::ImageView* more_; | 74 views::ImageView* more_; |
| 80 bool is_default_view_; | 75 bool is_default_view_; |
| 81 | 76 |
| 82 DISALLOW_COPY_AND_ASSIGN(VolumeView); | 77 DISALLOW_COPY_AND_ASSIGN(VolumeView); |
| 83 }; | 78 }; |
| 84 | 79 |
| 85 } // namespace tray | 80 } // namespace tray |
| 86 } // namespace internal | |
| 87 } // namespace ash | 81 } // namespace ash |
| 88 | 82 |
| 89 #endif // ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ | 83 #endif // ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ |
| 90 | 84 |
| OLD | NEW |