| 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 "base/logging.h" |    7 #include "base/logging.h" | 
|    8 #include "third_party/skia/include/core/SkColor.h" |    8 #include "third_party/skia/include/core/SkColor.h" | 
|    9 #include "ui/gfx/color_palette.h" |    9 #include "ui/gfx/color_palette.h" | 
|   10  |   10  | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   42  |   42  | 
|   43 const int kTrayPopupAutoCloseDelayInSeconds = 2; |   43 const int kTrayPopupAutoCloseDelayInSeconds = 2; | 
|   44 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; |   44 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; | 
|   45 const int kTrayPopupPaddingHorizontal = 18; |   45 const int kTrayPopupPaddingHorizontal = 18; | 
|   46 const int kTrayPopupPaddingBetweenItems = 10; |   46 const int kTrayPopupPaddingBetweenItems = 10; | 
|   47 const int kTrayPopupButtonEndMargin = 10; |   47 const int kTrayPopupButtonEndMargin = 10; | 
|   48 const int kTrayPopupLabelHorizontalPadding = 4; |   48 const int kTrayPopupLabelHorizontalPadding = 4; | 
|   49  |   49  | 
|   50 const int kTrayDetailedViewTransitionDelayMs = 100; |   50 const int kTrayDetailedViewTransitionDelayMs = 100; | 
|   51  |   51  | 
|   52 const int kTrayPopupSliderPaddingMD = 16; |  | 
|   53 const int kTrayPopupLabelRightPadding = 8; |   52 const int kTrayPopupLabelRightPadding = 8; | 
|   54  |   53  | 
|   55 const int kTrayPopupDetailsIconWidth = 25; |   54 const int kTrayPopupDetailsIconWidth = 25; | 
|   56 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; |   55 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; | 
|   57 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); |   56 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); | 
|   58 const int kTrayPopupScrollSeparatorHeight = 15; |   57 const int kTrayPopupScrollSeparatorHeight = 15; | 
|   59 const int kTrayRoundedBorderRadius = 2; |   58 const int kTrayRoundedBorderRadius = 2; | 
|   60  |   59  | 
|   61 const int kTrayToggleButtonWidth = 68; |   60 const int kTrayToggleButtonWidth = 68; | 
|   62  |   61  | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  153     case TRAY_IME_MENU_ICON: |  152     case TRAY_IME_MENU_ICON: | 
|  154       return kTrayImeMenuIcon[mode]; |  153       return kTrayImeMenuIcon[mode]; | 
|  155     case TRAY_IMAGE_ITEM_PADDING: |  154     case TRAY_IMAGE_ITEM_PADDING: | 
|  156       return kTrayImageItemPadding[mode]; |  155       return kTrayImageItemPadding[mode]; | 
|  157   } |  156   } | 
|  158   NOTREACHED(); |  157   NOTREACHED(); | 
|  159   return 0; |  158   return 0; | 
|  160 } |  159 } | 
|  161  |  160  | 
|  162 }  // namespace ash |  161 }  // namespace ash | 
| OLD | NEW |