| 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/common/system/tray/tray_constants.h" | 5 #include "ash/common/system/tray/tray_constants.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "third_party/skia/include/core/SkColor.h" | 9 #include "third_party/skia/include/core/SkColor.h" |
| 10 | 10 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 const int kBubblePaddingVerticalBottom = 3; | 22 const int kBubblePaddingVerticalBottom = 3; |
| 23 const int kBubblePaddingVerticalSide = 15; | 23 const int kBubblePaddingVerticalSide = 15; |
| 24 | 24 |
| 25 // Top inset of system tray bubble for bottom anchor alignment. | 25 // Top inset of system tray bubble for bottom anchor alignment. |
| 26 const int kTrayBubbleAnchorTopInsetBottomAnchor = 3; | 26 const int kTrayBubbleAnchorTopInsetBottomAnchor = 3; |
| 27 | 27 |
| 28 const int kTrayImageItemHorizontalPaddingBottomAlignment = 1; | 28 const int kTrayImageItemHorizontalPaddingBottomAlignment = 1; |
| 29 const int kTrayImageItemHorizontalPaddingVerticalAlignment = 1; | 29 const int kTrayImageItemHorizontalPaddingVerticalAlignment = 1; |
| 30 const int kTrayImageItemVerticalPaddingVerticalAlignment = 1; | 30 const int kTrayImageItemVerticalPaddingVerticalAlignment = 1; |
| 31 | 31 |
| 32 // Size of IME menu tray. |
| 33 const int kTrayImeIconSize = 40; |
| 34 |
| 32 // Size of tray items on the primary axis. | 35 // Size of tray items on the primary axis. |
| 33 const int kTrayItemSize = 32; | 36 const int kTrayItemSize = 32; |
| 34 | 37 |
| 35 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7; | 38 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7; |
| 36 | 39 |
| 37 // Vertical padding between status tray items when the shelf is vertical. | 40 // Vertical padding between status tray items when the shelf is vertical. |
| 38 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; | 41 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; |
| 39 | 42 |
| 40 const int kTrayMenuBottomRowPadding = 5; | 43 const int kTrayMenuBottomRowPadding = 5; |
| 41 const int kTrayMenuBottomRowPaddingBetweenItems = -1; | 44 const int kTrayMenuBottomRowPaddingBetweenItems = -1; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 case TRAY_PADDING_FROM_EDGE_OF_SHELF: | 105 case TRAY_PADDING_FROM_EDGE_OF_SHELF: |
| 103 return kTrayPaddingFromEdgeOfShelf[mode]; | 106 return kTrayPaddingFromEdgeOfShelf[mode]; |
| 104 case VIRTUAL_KEYBOARD_BUTTON_SIZE: | 107 case VIRTUAL_KEYBOARD_BUTTON_SIZE: |
| 105 return kVirtualKeyboardButtonSize[mode]; | 108 return kVirtualKeyboardButtonSize[mode]; |
| 106 } | 109 } |
| 107 NOTREACHED(); | 110 NOTREACHED(); |
| 108 return 0; | 111 return 0; |
| 109 } | 112 } |
| 110 | 113 |
| 111 } // namespace ash | 114 } // namespace ash |
| OLD | NEW |