| 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 #include "ash/system/tray/tray_views.h" | 5 #include "ash/system/tray/tray_utils.h" |
| 6 | 6 |
| 7 #include "ash/system/tray/tray_constants.h" | 7 #include "ash/system/tray/tray_constants.h" |
| 8 #include "ash/system/tray/tray_item_view.h" | 8 #include "ash/system/tray/tray_item_view.h" |
| 9 #include "ui/gfx/font.h" | 9 #include "ui/gfx/font.h" |
| 10 #include "ui/views/border.h" | 10 #include "ui/views/border.h" |
| 11 #include "ui/views/controls/label.h" | 11 #include "ui/views/controls/label.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 namespace internal { | 14 namespace internal { |
| 15 | 15 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 tray_view->set_border(views::Border::CreateEmptyBorder( | 56 tray_view->set_border(views::Border::CreateEmptyBorder( |
| 57 kTrayLabelItemVerticalPaddingVeriticalAlignment, | 57 kTrayLabelItemVerticalPaddingVeriticalAlignment, |
| 58 horizontal_padding, | 58 horizontal_padding, |
| 59 kTrayLabelItemVerticalPaddingVeriticalAlignment, | 59 kTrayLabelItemVerticalPaddingVeriticalAlignment, |
| 60 horizontal_padding)); | 60 horizontal_padding)); |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 | 63 |
| 64 } // namespace internal | 64 } // namespace internal |
| 65 } // namespace ash | 65 } // namespace ash |
| OLD | NEW |