Chromium Code Reviews| Index: ash/common/system/tray/tray_constants.cc |
| diff --git a/ash/common/system/tray/tray_constants.cc b/ash/common/system/tray/tray_constants.cc |
| index 304d9ccdd86595d1e2f33fc09efc801b504333b3..e8af140c38291bcb7a8fa81fefc0b943b30a9c69 100644 |
| --- a/ash/common/system/tray/tray_constants.cc |
| +++ b/ash/common/system/tray/tray_constants.cc |
| @@ -114,6 +114,8 @@ int GetTrayConstant(TrayConstant constant) { |
| const int kTrayPopupItemRightInset[] = {0, 0, 0}; |
| const int kTrayPopupItemMinStartWidth[] = {46, 48, 48}; |
| const int kTrayPopupItemMinEndWidth[] = {40, 40, 40}; |
| + const int kTrayPopupTransitionToDefaultViewDelayMs[] = {0, 80, 100}; |
|
tdanderson
2016/11/13 20:09:02
I'm OK with trying this approach, given that we ha
bruthig
2016/11/13 20:47:51
Acknowledged.
|
| + const int kTrayPopupTransitionToDetailedViewDelayMs[] = {0, 80, 100}; |
| const int kVirtualKeyboardButtonSize[] = {39, kTrayItemSize, kTrayItemSize}; |
| const int kTrayImeMenuIcon[] = {40, kTrayItemSize, kTrayItemSize}; |
| const int kTrayImageItemPadding[] = {1, 3, 3}; |
| @@ -145,6 +147,10 @@ int GetTrayConstant(TrayConstant constant) { |
| return kTrayPopupItemMinStartWidth[mode]; |
| case TRAY_POPUP_ITEM_MIN_END_WIDTH: |
| return kTrayPopupItemMinEndWidth[mode]; |
| + case TRAY_POPUP_TRANSITION_TO_DEFAULT_DELAY: |
| + return kTrayPopupTransitionToDefaultViewDelayMs[mode]; |
| + case TRAY_POPUP_TRANSITION_TO_DETAILED_DELAY: |
| + return kTrayPopupTransitionToDetailedViewDelayMs[mode]; |
| case VIRTUAL_KEYBOARD_BUTTON_SIZE: |
| return kVirtualKeyboardButtonSize[mode]; |
| case TRAY_IME_MENU_ICON: |