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

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

Issue 1378023003: Update Location Bar Bubbles Layout for Material Design (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/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 kIconLabelViewInternalPadding[] = {3, 2, 2};
11 const int kIconLabelViewTrailingPadding[] = {2, 8, 8}; 12 const int kIconLabelViewTrailingPadding[] = {2, 8, 8};
13 const int kLocationBarBubbleFontPixelSize[] = {16, 11, 11};
12 const int kLocationBarBubbleHorizontalPadding[] = {1, 5, 5}; 14 const int kLocationBarBubbleHorizontalPadding[] = {1, 5, 5};
13 const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3}; 15 const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3};
14 const int kLocationBarHeight[] = {0, 28, 32}; 16 const int kLocationBarHeight[] = {0, 28, 32};
15 const int kLocationBarHorizontalPadding[] = {3, 6, 6}; 17 const int kLocationBarHorizontalPadding[] = {3, 6, 6};
16 const int kLocationBarVerticalPadding[] = {2, 2, 2}; 18 const int kLocationBarVerticalPadding[] = {2, 2, 2};
17 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0}; 19 const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
18 const int kOmniboxFontPixelSize[] = {16, 14, 14}; 20 const int kOmniboxFontPixelSize[] = {16, 14, 14};
19 const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 2, 2}; 21 const int kTabCloseButtonTrailingPaddingOverlap[] = {2, 2, 2};
20 const int kTabFaviconTitleSpacing[] = {4, 4, 4}; 22 const int kTabFaviconTitleSpacing[] = {4, 4, 4};
21 const int kTabMaximumTitleWidth[] = {175, 175, 175}; 23 const int kTabMaximumTitleWidth[] = {175, 175, 175};
22 const int kTabPinnedContentWidth[] = {25, 25, 25}; 24 const int kTabPinnedContentWidth[] = {25, 25, 25};
23 #if defined(OS_MACOSX) 25 #if defined(OS_MACOSX)
24 const int kTabstripTabOverlap[] = {19, 19, 19}; 26 const int kTabstripTabOverlap[] = {19, 19, 19};
25 #else 27 #else
26 const int kTabstripTabOverlap[] = {26, 26, 26}; 28 const int kTabstripTabOverlap[] = {26, 26, 26};
27 #endif 29 #endif
28 const int kTabstripToolbarOverlap[] = {3, 3, 3}; 30 const int kTabstripToolbarOverlap[] = {3, 3, 3};
29 const int kTabstripTopShadowHeight[] = {3, 3, 3}; 31 const int kTabstripTopShadowHeight[] = {3, 3, 3};
30 const int kToolbarContentShadowHeight[] = {0, 0, 0}; 32 const int kToolbarContentShadowHeight[] = {0, 0, 0};
31 const int kToolbarContentShadowHeightAsh[] = {2, 0, 0}; 33 const int kToolbarContentShadowHeightAsh[] = {2, 0, 0};
32 const int kToolbarElementPadding[] = {0, 0, 8}; 34 const int kToolbarElementPadding[] = {0, 0, 8};
33 const int kToolbarLocationBarRightPadding[] = {0, 4, 8}; 35 const int kToolbarLocationBarRightPadding[] = {0, 4, 8};
34 const int kToolbarStandardSpacing[] = {3, 4, 8}; 36 const int kToolbarStandardSpacing[] = {3, 4, 8};
35 37
36 const int mode = ui::MaterialDesignController::GetMode(); 38 const int mode = ui::MaterialDesignController::GetMode();
37 switch (constant) { 39 switch (constant) {
40 case ICON_LABEL_VIEW_INTERNAL_PADDING:
41 return kIconLabelViewInternalPadding[mode];
38 case ICON_LABEL_VIEW_TRAILING_PADDING: 42 case ICON_LABEL_VIEW_TRAILING_PADDING:
39 return kIconLabelViewTrailingPadding[mode]; 43 return kIconLabelViewTrailingPadding[mode];
44 case LOCATION_BAR_BUBBLE_FONT_PIXEL_SIZE:
45 return kLocationBarBubbleFontPixelSize[mode];
40 case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING: 46 case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
41 return kLocationBarBubbleHorizontalPadding[mode]; 47 return kLocationBarBubbleHorizontalPadding[mode];
42 case LOCATION_BAR_BUBBLE_VERTICAL_PADDING: 48 case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
43 return kLocationBarBubbleVerticalPadding[mode]; 49 return kLocationBarBubbleVerticalPadding[mode];
44 case LOCATION_BAR_HEIGHT: 50 case LOCATION_BAR_HEIGHT:
45 return kLocationBarHeight[mode]; 51 return kLocationBarHeight[mode];
46 case LOCATION_BAR_HORIZONTAL_PADDING: 52 case LOCATION_BAR_HORIZONTAL_PADDING:
47 return kLocationBarHorizontalPadding[mode]; 53 return kLocationBarHorizontalPadding[mode];
48 case LOCATION_BAR_VERTICAL_PADDING: 54 case LOCATION_BAR_VERTICAL_PADDING:
49 return kLocationBarVerticalPadding[mode]; 55 return kLocationBarVerticalPadding[mode];
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 kToolbarBottomPadding[mode], 124 kToolbarBottomPadding[mode],
119 kToolbarRightPadding[mode]); 125 kToolbarRightPadding[mode]);
120 case TOOLBAR_BUTTON: { 126 case TOOLBAR_BUTTON: {
121 const int inset = kToolbarButtonPadding[mode]; 127 const int inset = kToolbarButtonPadding[mode];
122 return gfx::Insets(inset, inset, inset, inset); 128 return gfx::Insets(inset, inset, inset, inset);
123 } 129 }
124 } 130 }
125 NOTREACHED(); 131 NOTREACHED();
126 return gfx::Insets(); 132 return gfx::Insets();
127 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698