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

Side by Side Diff: chrome/browser/ui/layout_constants.cc

Issue 1998493002: Update omnibox chips in MD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: slight refactor Created 4 years, 7 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 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/layout_constants.h" 5 #include "chrome/browser/ui/layout_constants.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ui/base/material_design/material_design_controller.h" 9 #include "ui/base/material_design/material_design_controller.h"
10 10
11 int GetLayoutConstant(LayoutConstant constant) { 11 int GetLayoutConstant(LayoutConstant constant) {
12 const int kFindBarVerticalOffset[] = {1, 6, 6}; 12 const int kFindBarVerticalOffset[] = {1, 6, 6};
13 const int kIconLabelViewInternalSpacing[] = {3, 5, 5}; 13 const int kIconLabelViewInternalSpacing[] = {3, 5, 5};
14 const int kIconLabelViewTrailingPadding[] = {2, 6, 6}; 14 const int kIconLabelViewTrailingPadding[] = {2, 6, 6};
15 const int kLocationBarBorderThickness[] = {2, 1, 1}; 15 const int kLocationBarBorderThickness[] = {2, 1, 1};
16 const int kLocationBarPreEditSpacing[] = {0, 2, 2};
16 const int kLocationBarBubbleFontVerticalPadding[] = {1, 2, 4}; 17 const int kLocationBarBubbleFontVerticalPadding[] = {1, 2, 4};
17 const int kLocationBarBubbleHorizontalPadding[] = {1, 4, 4}; 18 const int kLocationBarBubbleHorizontalPadding[] = {1, 0, 0};
18 const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3}; 19 const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3};
19 const int kLocationBarBubbleAnchorVerticalInset[] = {5, 6, 8}; 20 const int kLocationBarBubbleAnchorVerticalInset[] = {5, 6, 8};
20 const int kLocationBarHeight[] = {27, 28, 32}; 21 const int kLocationBarHeight[] = {27, 28, 32};
21 const int kLocationBarHorizontalPadding[] = {3, 6, 6}; 22 const int kLocationBarHorizontalPadding[] = {3, 6, 6};
22 const int kLocationBarVerticalPadding[] = {0, 1, 1}; 23 const int kLocationBarVerticalPadding[] = {0, 1, 1};
23 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0}; 24 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
24 const int kOmniboxFontPixelSize[] = {16, 14, 14}; 25 const int kOmniboxFontPixelSize[] = {16, 14, 14};
25 const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 0, 0}; 26 const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 0, 0};
26 const int kTabFaviconTitleSpacing[] = {4, 6, 6}; 27 const int kTabFaviconTitleSpacing[] = {4, 6, 6};
27 const int kTabHeight[] = {29, 29, 33}; 28 const int kTabHeight[] = {29, 29, 33};
(...skipping 17 matching lines...) Expand all
45 const int mode = ui::MaterialDesignController::GetMode(); 46 const int mode = ui::MaterialDesignController::GetMode();
46 switch (constant) { 47 switch (constant) {
47 case FIND_BAR_TOOLBAR_OVERLAP: 48 case FIND_BAR_TOOLBAR_OVERLAP:
48 return kFindBarVerticalOffset[mode]; 49 return kFindBarVerticalOffset[mode];
49 case ICON_LABEL_VIEW_INTERNAL_SPACING: 50 case ICON_LABEL_VIEW_INTERNAL_SPACING:
50 return kIconLabelViewInternalSpacing[mode]; 51 return kIconLabelViewInternalSpacing[mode];
51 case ICON_LABEL_VIEW_TRAILING_PADDING: 52 case ICON_LABEL_VIEW_TRAILING_PADDING:
52 return kIconLabelViewTrailingPadding[mode]; 53 return kIconLabelViewTrailingPadding[mode];
53 case LOCATION_BAR_BORDER_THICKNESS: 54 case LOCATION_BAR_BORDER_THICKNESS:
54 return kLocationBarBorderThickness[mode]; 55 return kLocationBarBorderThickness[mode];
56 case LOCATION_BAR_PRE_EDIT_SPACING:
57 return kLocationBarPreEditSpacing[mode];
55 case LOCATION_BAR_BUBBLE_FONT_VERTICAL_PADDING: 58 case LOCATION_BAR_BUBBLE_FONT_VERTICAL_PADDING:
56 return kLocationBarBubbleFontVerticalPadding[mode]; 59 return kLocationBarBubbleFontVerticalPadding[mode];
57 case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING: 60 case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
58 return kLocationBarBubbleHorizontalPadding[mode]; 61 return kLocationBarBubbleHorizontalPadding[mode];
59 case LOCATION_BAR_BUBBLE_VERTICAL_PADDING: 62 case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
60 return kLocationBarBubbleVerticalPadding[mode]; 63 return kLocationBarBubbleVerticalPadding[mode];
61 case LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET: 64 case LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET:
62 return kLocationBarBubbleAnchorVerticalInset[mode]; 65 return kLocationBarBubbleAnchorVerticalInset[mode];
63 case LOCATION_BAR_HEIGHT: 66 case LOCATION_BAR_HEIGHT:
64 return kLocationBarHeight[mode]; 67 return kLocationBarHeight[mode];
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 const int kNewTabButtonHeight[] = {18, 18, 21}; 151 const int kNewTabButtonHeight[] = {18, 18, 21};
149 152
150 const int mode = ui::MaterialDesignController::GetMode(); 153 const int mode = ui::MaterialDesignController::GetMode();
151 switch (size) { 154 switch (size) {
152 case NEW_TAB_BUTTON: 155 case NEW_TAB_BUTTON:
153 return gfx::Size(kNewTabButtonWidth[mode], kNewTabButtonHeight[mode]); 156 return gfx::Size(kNewTabButtonWidth[mode], kNewTabButtonHeight[mode]);
154 } 157 }
155 NOTREACHED(); 158 NOTREACHED();
156 return gfx::Size(); 159 return gfx::Size();
157 } 160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698