Chromium Code Reviews| 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 #include "ui/gfx/color_palette.h" | 10 #include "ui/gfx/color_palette.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 97 const int kHorizontalSeparatorHeight = 24; | 97 const int kHorizontalSeparatorHeight = 24; |
| 98 | 98 |
| 99 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; | 99 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; |
| 100 const float kTrayPopupInkDropRippleOpacity = 0.06f; | 100 const float kTrayPopupInkDropRippleOpacity = 0.06f; |
| 101 const float kTrayPopupInkDropHighlightOpacity = 0.08f; | 101 const float kTrayPopupInkDropHighlightOpacity = 0.08f; |
| 102 const int kTrayPopupInkDropInset = 4; | 102 const int kTrayPopupInkDropInset = 4; |
| 103 | 103 |
| 104 int GetTrayConstant(TrayConstant constant) { | 104 int GetTrayConstant(TrayConstant constant) { |
| 105 const int kTrayItemHeightLegacy[] = {38, kTrayItemSize, kTrayItemSize}; | 105 const int kTrayItemHeightLegacy[] = {38, kTrayItemSize, kTrayItemSize}; |
| 106 const int kTraySpacing[] = {4, 0, 0}; | 106 const int kTraySpacing[] = {4, 0, 0}; |
| 107 const int kTrayPaddingFromEdgeOfShelf[] = {3, 4, 4}; | 107 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 3}; |
|
tdanderson
2016/11/14 04:03:21
With this change, can you check that the system me
Evan Stade
2016/11/15 01:11:55
it's hard to check that when chromeos is running i
| |
| 108 const int kTrayPopupItemHeight[] = {46, 48, 48}; | 108 const int kTrayPopupItemHeight[] = {46, 48, 48}; |
| 109 // FixedSizedImageViews use the contained ImageView's width for 0 values. | 109 // FixedSizedImageViews use the contained ImageView's width for 0 values. |
| 110 const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48}; | 110 const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48}; |
| 111 const int kTrayPopupItemMoreImageSize[] = {25, kMenuIconSize, kMenuIconSize}; | 111 const int kTrayPopupItemMoreImageSize[] = {25, kMenuIconSize, kMenuIconSize}; |
| 112 const int kTrayPopupItemMoreRegionHorizontalInset[] = {10, 10, 10}; | 112 const int kTrayPopupItemMoreRegionHorizontalInset[] = {10, 10, 10}; |
| 113 const int kTrayPopupItemLeftInset[] = {0, 4, 4}; | 113 const int kTrayPopupItemLeftInset[] = {0, 4, 4}; |
| 114 const int kTrayPopupItemRightInset[] = {0, 0, 0}; | 114 const int kTrayPopupItemRightInset[] = {0, 0, 0}; |
| 115 const int kTrayPopupItemMinStartWidth[] = {46, 48, 48}; | 115 const int kTrayPopupItemMinStartWidth[] = {46, 48, 48}; |
| 116 const int kTrayPopupItemMinEndWidth[] = {40, 40, 40}; | 116 const int kTrayPopupItemMinEndWidth[] = {40, 40, 40}; |
| 117 const int kVirtualKeyboardButtonSize[] = {39, kTrayItemSize, kTrayItemSize}; | 117 const int kVirtualKeyboardButtonSize[] = {39, kTrayItemSize, kTrayItemSize}; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 case TRAY_IME_MENU_ICON: | 150 case TRAY_IME_MENU_ICON: |
| 151 return kTrayImeMenuIcon[mode]; | 151 return kTrayImeMenuIcon[mode]; |
| 152 case TRAY_IMAGE_ITEM_PADDING: | 152 case TRAY_IMAGE_ITEM_PADDING: |
| 153 return kTrayImageItemPadding[mode]; | 153 return kTrayImageItemPadding[mode]; |
| 154 } | 154 } |
| 155 NOTREACHED(); | 155 NOTREACHED(); |
| 156 return 0; | 156 return 0; |
| 157 } | 157 } |
| 158 | 158 |
| 159 } // namespace ash | 159 } // namespace ash |
| OLD | NEW |