| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_TRAY_TRAY_VIEWS_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/shelf_types.h" | 9 #include "ash/shelf/shelf_types.h" |
| 10 #include "ui/gfx/font.h" | 10 #include "ui/gfx/font.h" |
| 11 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
| 12 #include "ui/views/controls/button/custom_button.h" | 12 #include "ui/views/controls/button/custom_button.h" |
| 13 #include "ui/views/controls/button/image_button.h" | 13 #include "ui/views/controls/button/image_button.h" |
| 14 #include "ui/views/controls/button/label_button.h" | 14 #include "ui/views/controls/button/label_button.h" |
| 15 #include "ui/views/controls/button/label_button_border.h" | 15 #include "ui/views/controls/button/label_button_border.h" |
| 16 #include "ui/views/controls/image_view.h" | 16 #include "ui/views/controls/image_view.h" |
| 17 #include "ui/views/controls/scroll_view.h" | 17 #include "ui/views/controls/scroll_view.h" |
| 18 #include "ui/views/controls/slider.h" | 18 #include "ui/views/controls/slider.h" |
| 19 #include "ui/views/view.h" | 19 #include "ui/views/view.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment); | 151 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment); |
| 152 // Sets the empty border around a label tray item for adjusting the space | 152 // Sets the empty border around a label tray item for adjusting the space |
| 153 // around it. | 153 // around it. |
| 154 void SetTrayLabelItemBorder(TrayItemView* tray_view, | 154 void SetTrayLabelItemBorder(TrayItemView* tray_view, |
| 155 ShelfAlignment alignment); | 155 ShelfAlignment alignment); |
| 156 | 156 |
| 157 } // namespace internal | 157 } // namespace internal |
| 158 } // namespace ash | 158 } // namespace ash |
| 159 | 159 |
| 160 #endif // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ | 160 #endif // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ |
| OLD | NEW |