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

Side by Side Diff: chrome/browser/ui/views/harmony/layout_delegate.cc

Issue 2783023002: Use an InsetMetric instead of a constant for vector button padding. (Closed)
Patch Set: revert the stuff that got mixed in from another patch 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/harmony/layout_delegate.h" 5 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/ui/views/chrome_views_delegate.h" 9 #include "chrome/browser/ui/views/chrome_views_delegate.h"
10 #include "chrome/browser/ui/views/harmony/chrome_typography.h" 10 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 case Metric::SUBSECTION_HORIZONTAL_INDENT: 61 case Metric::SUBSECTION_HORIZONTAL_INDENT:
62 return views::kCheckboxIndent; 62 return views::kCheckboxIndent;
63 case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING: 63 case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING:
64 return views::kUnrelatedControlHorizontalSpacing; 64 return views::kUnrelatedControlHorizontalSpacing;
65 case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING_LARGE: 65 case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING_LARGE:
66 return views::kUnrelatedControlLargeHorizontalSpacing; 66 return views::kUnrelatedControlLargeHorizontalSpacing;
67 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING: 67 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING:
68 return views::kUnrelatedControlVerticalSpacing; 68 return views::kUnrelatedControlVerticalSpacing;
69 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE: 69 case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
70 return views::kUnrelatedControlLargeVerticalSpacing; 70 return views::kUnrelatedControlLargeVerticalSpacing;
71 case Metric::VECTOR_IMAGE_BUTTON_PADDING:
72 return views::kVectorButtonExtraTouchSize;
71 } 73 }
72 NOTREACHED(); 74 NOTREACHED();
73 return 0; 75 return 0;
74 } 76 }
75 77
76 views::GridLayout::Alignment LayoutDelegate::GetControlLabelGridAlignment() 78 views::GridLayout::Alignment LayoutDelegate::GetControlLabelGridAlignment()
77 const { 79 const {
78 return views::GridLayout::TRAILING; 80 return views::GridLayout::TRAILING;
79 } 81 }
80 82
(...skipping 12 matching lines...) Expand all
93 int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const { 95 int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const {
94 return 0; 96 return 0;
95 } 97 }
96 98
97 const views::TypographyProvider& LayoutDelegate::GetTypographyProvider() const { 99 const views::TypographyProvider& LayoutDelegate::GetTypographyProvider() const {
98 // This is not a data member because then HarmonyLayoutDelegate would inherit 100 // This is not a data member because then HarmonyLayoutDelegate would inherit
99 // it, even when it provides its own. 101 // it, even when it provides its own.
100 CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ()); 102 CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ());
101 return legacy_provider; 103 return legacy_provider;
102 } 104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698