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

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

Issue 2781793002: Remove non-MD code for IME tray and tray menu. (Closed)
Patch Set: actual rebase Created 3 years, 8 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
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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 21 matching lines...) Expand all
32 32
33 const int kTrayImageItemPadding = 3; 33 const int kTrayImageItemPadding = 3;
34 34
35 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7; 35 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7;
36 36
37 // Vertical padding between status tray items when the shelf is vertical. 37 // Vertical padding between status tray items when the shelf is vertical.
38 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; 38 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4;
39 39
40 const int kTrayMenuBottomRowPadding = 3; 40 const int kTrayMenuBottomRowPadding = 3;
41 const int kTrayMenuBottomRowPaddingBetweenItems = -1; 41 const int kTrayMenuBottomRowPaddingBetweenItems = -1;
42 const int kTrayMenuMinimumWidth = 300; 42 const int kTrayMenuMinimumWidth = 352;
43 const int kTrayMenuMinimumWidthMd = 352;
44 43
45 const int kTrayPopupAutoCloseDelayInSeconds = 2; 44 const int kTrayPopupAutoCloseDelayInSeconds = 2;
46 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; 45 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5;
47 const int kTrayPopupPaddingHorizontal = 18; 46 const int kTrayPopupPaddingHorizontal = 18;
48 const int kTrayPopupPaddingBetweenItems = 10; 47 const int kTrayPopupPaddingBetweenItems = 10;
49 const int kTrayPopupButtonEndMargin = 10; 48 const int kTrayPopupButtonEndMargin = 10;
50 const int kTrayPopupLabelHorizontalPadding = 4; 49 const int kTrayPopupLabelHorizontalPadding = 4;
51 const int kTrayPopupItemMinHeight = 48; 50 const int kTrayPopupItemMinHeight = 48;
52 const int kTrayPopupItemMinStartWidth = 48; 51 const int kTrayPopupItemMinStartWidth = 48;
53 const int kTrayPopupItemMinEndWidth = 52 const int kTrayPopupItemMinEndWidth =
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 105
107 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; 106 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK;
108 const float kTrayPopupInkDropRippleOpacity = 0.06f; 107 const float kTrayPopupInkDropRippleOpacity = 0.06f;
109 const float kTrayPopupInkDropHighlightOpacity = 0.08f; 108 const float kTrayPopupInkDropHighlightOpacity = 0.08f;
110 const int kTrayPopupInkDropInset = 4; 109 const int kTrayPopupInkDropInset = 4;
111 const int kTrayPopupInkDropCornerRadius = 2; 110 const int kTrayPopupInkDropCornerRadius = 2;
112 111
113 const int kTrayPopupSystemInfoRowHeight = 40; 112 const int kTrayPopupSystemInfoRowHeight = 40;
114 113
115 } // namespace ash 114 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698