| 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_views.h" |
| 6 | 6 |
| 7 #include "ash/ash_constants.h" |
| 7 #include "ash/system/tray/tray_constants.h" | 8 #include "ash/system/tray/tray_constants.h" |
| 8 #include "ash/system/tray/tray_item_view.h" | 9 #include "ash/system/tray/tray_item_view.h" |
| 9 #include "grit/ash_resources.h" | 10 #include "grit/ash_resources.h" |
| 10 #include "grit/ash_strings.h" | 11 #include "grit/ash_strings.h" |
| 11 #include "grit/ui_resources.h" | 12 #include "grit/ui_resources.h" |
| 12 #include "ui/base/accessibility/accessible_view_state.h" | 13 #include "ui/base/accessibility/accessible_view_state.h" |
| 13 #include "ui/base/events/event.h" | 14 #include "ui/base/events/event.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 15 #include "ui/gfx/canvas.h" | 16 #include "ui/gfx/canvas.h" |
| 16 #include "ui/gfx/image/image.h" | 17 #include "ui/gfx/image/image.h" |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 tray_view->set_border(views::Border::CreateEmptyBorder( | 672 tray_view->set_border(views::Border::CreateEmptyBorder( |
| 672 kTrayLabelItemVerticalPaddingVeriticalAlignment, | 673 kTrayLabelItemVerticalPaddingVeriticalAlignment, |
| 673 horizontal_padding, | 674 horizontal_padding, |
| 674 kTrayLabelItemVerticalPaddingVeriticalAlignment, | 675 kTrayLabelItemVerticalPaddingVeriticalAlignment, |
| 675 horizontal_padding)); | 676 horizontal_padding)); |
| 676 } | 677 } |
| 677 } | 678 } |
| 678 | 679 |
| 679 } // namespace internal | 680 } // namespace internal |
| 680 } // namespace ash | 681 } // namespace ash |
| OLD | NEW |