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

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

Issue 1394763003: Update LocationBarView Background (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update nomenclature Created 5 years, 1 month 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/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 const int kIconLabelViewInternalPadding[] = {3, 2, 2};
13 const int kIconLabelViewTrailingPadding[] = {2, 8, 8}; 13 const int kIconLabelViewTrailingPadding[] = {2, 8, 8};
14 const int kLocationBarBubbleHorizontalPadding[] = {1, 5, 5}; 14 const int kLocationBarBorderThickness[] = {2, 1, 1};
15 const int kLocationBarBubbleVerticalPadding[] = {1, 5, 5}; 15 const int kLocationBarBubbleHorizontalPadding[] = {1, 4, 4};
16 const int kLocationBarBubbleVerticalPadding[] = {1, 4, 4};
16 const int kLocationBarHeight[] = {0, 28, 32}; 17 const int kLocationBarHeight[] = {0, 28, 32};
17 const int kLocationBarHorizontalPadding[] = {3, 6, 6}; 18 const int kLocationBarHorizontalPadding[] = {3, 6, 6};
18 const int kLocationBarVerticalPadding[] = {2, 2, 2}; 19 const int kLocationBarVerticalPadding[] = {2, 2, 2};
19 const int kNewTabButtonWidth[] = {34, 34, 34}; 20 const int kNewTabButtonWidth[] = {34, 34, 34};
20 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0}; 21 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
21 const int kOmniboxFontPixelSize[] = {16, 14, 14}; 22 const int kOmniboxFontPixelSize[] = {16, 14, 14};
22 const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 2, 2}; 23 const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 2, 2};
23 const int kTabFaviconTitleSpacing[] = {4, 4, 4}; 24 const int kTabFaviconTitleSpacing[] = {4, 4, 4};
24 const int kTabMaximumTitleWidth[] = {175, 175, 175}; 25 const int kTabMaximumTitleWidth[] = {175, 175, 175};
25 const int kTabPinnedContentWidth[] = {25, 25, 25}; 26 const int kTabPinnedContentWidth[] = {25, 25, 25};
(...skipping 12 matching lines...) Expand all
38 const int kToolbarStandardSpacing[] = {3, 4, 8}; 39 const int kToolbarStandardSpacing[] = {3, 4, 8};
39 40
40 const int mode = ui::MaterialDesignController::GetMode(); 41 const int mode = ui::MaterialDesignController::GetMode();
41 switch (constant) { 42 switch (constant) {
42 case FIND_BAR_TOOLBAR_OVERLAP: 43 case FIND_BAR_TOOLBAR_OVERLAP:
43 return kFindBarVerticalOffset[mode]; 44 return kFindBarVerticalOffset[mode];
44 case ICON_LABEL_VIEW_INTERNAL_PADDING: 45 case ICON_LABEL_VIEW_INTERNAL_PADDING:
45 return kIconLabelViewInternalPadding[mode]; 46 return kIconLabelViewInternalPadding[mode];
46 case ICON_LABEL_VIEW_TRAILING_PADDING: 47 case ICON_LABEL_VIEW_TRAILING_PADDING:
47 return kIconLabelViewTrailingPadding[mode]; 48 return kIconLabelViewTrailingPadding[mode];
49 case LOCATION_BAR_BORDER_THICKNESS:
50 return kLocationBarBorderThickness[mode];
48 case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING: 51 case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
49 return kLocationBarBubbleHorizontalPadding[mode]; 52 return kLocationBarBubbleHorizontalPadding[mode];
50 case LOCATION_BAR_BUBBLE_VERTICAL_PADDING: 53 case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
51 return kLocationBarBubbleVerticalPadding[mode]; 54 return kLocationBarBubbleVerticalPadding[mode];
52 case LOCATION_BAR_HEIGHT: 55 case LOCATION_BAR_HEIGHT:
53 return kLocationBarHeight[mode]; 56 return kLocationBarHeight[mode];
54 case LOCATION_BAR_HORIZONTAL_PADDING: 57 case LOCATION_BAR_HORIZONTAL_PADDING:
55 return kLocationBarHorizontalPadding[mode]; 58 return kLocationBarHorizontalPadding[mode];
56 case LOCATION_BAR_VERTICAL_PADDING: 59 case LOCATION_BAR_VERTICAL_PADDING:
57 return kLocationBarVerticalPadding[mode]; 60 return kLocationBarVerticalPadding[mode];
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 kToolbarBottomPadding[mode], 136 kToolbarBottomPadding[mode],
134 kToolbarRightPadding[mode]); 137 kToolbarRightPadding[mode]);
135 case TOOLBAR_BUTTON: { 138 case TOOLBAR_BUTTON: {
136 const int inset = kToolbarButtonPadding[mode]; 139 const int inset = kToolbarButtonPadding[mode];
137 return gfx::Insets(inset, inset, inset, inset); 140 return gfx::Insets(inset, inset, inset, inset);
138 } 141 }
139 } 142 }
140 NOTREACHED(); 143 NOTREACHED();
141 return gfx::Insets(); 144 return gfx::Insets();
142 } 145 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/layout_constants.h ('k') | chrome/browser/ui/views/location_bar/background_with_1_px_border.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698