OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/ui/views/layout_constants.h" | 5 #include "chrome/browser/ui/views/layout_constants.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "ui/base/resource/material_design/material_design_controller.h" | 8 #include "ui/base/resource/material_design/material_design_controller.h" |
9 | 9 |
10 int GetLayoutConstant(LayoutConstant constant) { | 10 int GetLayoutConstant(LayoutConstant constant) { |
11 const int kFindBarVerticalOffset[] = {1, 6, 6}; | 11 const int kFindBarVerticalOffset[] = {1, 6, 6}; |
12 const int kIconLabelViewInternalPadding[] = {3, 2, 2}; | 12 // The -1 means the label and the icon will overlap by a pixel. |
| 13 const int kIconLabelViewInternalPadding[] = {3, -1, -1}; |
13 const int kIconLabelViewTrailingPadding[] = {2, 8, 8}; | 14 const int kIconLabelViewTrailingPadding[] = {2, 8, 8}; |
14 const int kLocationBarBorderThickness[] = {2, 1, 1}; | 15 const int kLocationBarBorderThickness[] = {2, 1, 1}; |
15 const int kLocationBarBubbleHorizontalPadding[] = {1, 4, 4}; | 16 const int kLocationBarBubbleHorizontalPadding[] = {1, 4, 4}; |
16 const int kLocationBarBubbleVerticalPadding[] = {1, 4, 4}; | 17 const int kLocationBarBubbleVerticalPadding[] = {1, 4, 4}; |
17 const int kLocationBarHeight[] = {0, 28, 32}; | 18 const int kLocationBarHeight[] = {0, 28, 32}; |
18 const int kLocationBarHorizontalPadding[] = {3, 6, 6}; | 19 const int kLocationBarHorizontalPadding[] = {3, 6, 6}; |
19 const int kLocationBarVerticalPadding[] = {2, 2, 2}; | 20 const int kLocationBarVerticalPadding[] = {2, 2, 2}; |
20 const int kNewTabButtonWidth[] = {34, 34, 34}; | 21 const int kNewTabButtonWidth[] = {34, 34, 34}; |
21 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0}; | 22 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0}; |
22 const int kOmniboxFontPixelSize[] = {16, 14, 14}; | 23 const int kOmniboxFontPixelSize[] = {16, 14, 14}; |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 kToolbarBottomPadding[mode], | 141 kToolbarBottomPadding[mode], |
141 kToolbarRightPadding[mode]); | 142 kToolbarRightPadding[mode]); |
142 case TOOLBAR_BUTTON: { | 143 case TOOLBAR_BUTTON: { |
143 const int inset = kToolbarButtonPadding[mode]; | 144 const int inset = kToolbarButtonPadding[mode]; |
144 return gfx::Insets(inset, inset, inset, inset); | 145 return gfx::Insets(inset, inset, inset, inset); |
145 } | 146 } |
146 } | 147 } |
147 NOTREACHED(); | 148 NOTREACHED(); |
148 return gfx::Insets(); | 149 return gfx::Insets(); |
149 } | 150 } |
OLD | NEW |