Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: ash/common/system/tray/tray_constants.h

Issue 2271523002: Adds emoji/handwriting/vocie buttons on opt-in IME menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated with vectorized icons. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 typedef unsigned int SkColor; 10 typedef unsigned int SkColor;
(...skipping 10 matching lines...) Expand all
21 extern const int kBubblePaddingHorizontalSide; 21 extern const int kBubblePaddingHorizontalSide;
22 extern const int kBubblePaddingVerticalBottom; 22 extern const int kBubblePaddingVerticalBottom;
23 extern const int kBubblePaddingVerticalSide; 23 extern const int kBubblePaddingVerticalSide;
24 24
25 extern const int kTrayBubbleAnchorTopInsetBottomAnchor; 25 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
26 26
27 extern const int kTrayImageItemHorizontalPaddingBottomAlignment; 27 extern const int kTrayImageItemHorizontalPaddingBottomAlignment;
28 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment; 28 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment;
29 extern const int kTrayImageItemVerticalPaddingVerticalAlignment; 29 extern const int kTrayImageItemVerticalPaddingVerticalAlignment;
30 30
31 extern const int kTrayImeIconSize;
32 extern const int kTrayImeBottomRowPadding;
33 extern const int kTrayImeBottomRowPaddingBetweenItems;
34
35 ASH_EXPORT extern const int kTrayItemSize; 31 ASH_EXPORT extern const int kTrayItemSize;
36 32
37 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment; 33 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment;
38 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment; 34 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment;
39 35
40 extern const int kTrayMenuBottomRowPadding; 36 extern const int kTrayMenuBottomRowPadding;
41 extern const int kTrayMenuBottomRowPaddingBetweenItems; 37 extern const int kTrayMenuBottomRowPaddingBetweenItems;
42 38
43 extern const int kTrayPopupAutoCloseDelayInSeconds; 39 extern const int kTrayPopupAutoCloseDelayInSeconds;
44 extern const int kTrayPopupAutoCloseDelayForTextInSeconds; 40 extern const int kTrayPopupAutoCloseDelayForTextInSeconds;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 TRAY_PADDING_FROM_EDGE_OF_SHELF, 105 TRAY_PADDING_FROM_EDGE_OF_SHELF,
110 106
111 // The height of the rows in the system tray menu. 107 // The height of the rows in the system tray menu.
112 TRAY_POPUP_ITEM_HEIGHT, 108 TRAY_POPUP_ITEM_HEIGHT,
113 109
114 // The width and height of the virtual keyboard button in the status tray 110 // The width and height of the virtual keyboard button in the status tray
115 // area. For non-MD, adjustments are made to the button dimensions based on 111 // area. For non-MD, adjustments are made to the button dimensions based on
116 // the shelf orientation, so this constant does not specify the true 112 // the shelf orientation, so this constant does not specify the true
117 // user-visible button bounds. 113 // user-visible button bounds.
118 VIRTUAL_KEYBOARD_BUTTON_SIZE, 114 VIRTUAL_KEYBOARD_BUTTON_SIZE,
115
116 // The icon size of opt-in IME menu tray.
117 TRAY_IME_MENU_ICON,
119 }; 118 };
120 119
121 int GetTrayConstant(TrayConstant constant); 120 int GetTrayConstant(TrayConstant constant);
122 121
123 namespace test { 122 namespace test {
124 const int kSettingsTrayItemViewId = 10000; 123 const int kSettingsTrayItemViewId = 10000;
125 const int kAccessibilityTrayItemViewId = 10001; 124 const int kAccessibilityTrayItemViewId = 10001;
126 } // namespace test 125 } // namespace test
127 126
128 } // namespace ash 127 } // namespace ash
129 128
130 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 129 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698