| 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 "base/macros.h" |
| 9 #include "ui/gfx/font.h" | 10 #include "ui/gfx/font.h" |
| 10 #include "ui/views/controls/button/button.h" | 11 #include "ui/views/controls/button/button.h" |
| 11 #include "ui/views/controls/slider.h" | 12 #include "ui/views/controls/slider.h" |
| 12 | 13 |
| 13 namespace views { | 14 namespace views { |
| 14 class View; | 15 class View; |
| 15 class ImageView; | 16 class ImageView; |
| 16 class Separator; | 17 class Separator; |
| 17 class Slider; | 18 class Slider; |
| 18 } | 19 } |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 views::ImageView* more_; | 75 views::ImageView* more_; |
| 75 bool is_default_view_; | 76 bool is_default_view_; |
| 76 | 77 |
| 77 DISALLOW_COPY_AND_ASSIGN(VolumeView); | 78 DISALLOW_COPY_AND_ASSIGN(VolumeView); |
| 78 }; | 79 }; |
| 79 | 80 |
| 80 } // namespace tray | 81 } // namespace tray |
| 81 } // namespace ash | 82 } // namespace ash |
| 82 | 83 |
| 83 #endif // ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ | 84 #endif // ASH_SYSTEM_AUDIO_VOLUME_VIEW_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1540753002:
Switch to standard integer types in ash/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master