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

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

Issue 2968713003: Harmonize the find in page dialog. (Closed)
Patch Set: Fix format Created 3 years, 5 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/chrome_layout_provider.h" 5 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 // static 29 // static
30 int ChromeLayoutProvider::GetControlHeightForFont(const gfx::FontList& font) { 30 int ChromeLayoutProvider::GetControlHeightForFont(const gfx::FontList& font) {
31 return std::max(views::style::GetLineHeight(views::style::CONTEXT_LABEL, 31 return std::max(views::style::GetLineHeight(views::style::CONTEXT_LABEL,
32 views::style::STYLE_PRIMARY), 32 views::style::STYLE_PRIMARY),
33 font.GetHeight()) + 33 font.GetHeight()) +
34 Get()->GetDistanceMetric(DISTANCE_CONTROL_TOTAL_VERTICAL_TEXT_PADDING); 34 Get()->GetDistanceMetric(DISTANCE_CONTROL_TOTAL_VERTICAL_TEXT_PADDING);
35 } 35 }
36 36
37 gfx::Insets ChromeLayoutProvider::GetInsetsMetric(int metric) const {
38 switch (metric) {
39 case ChromeInsetsMetric::INSETS_TOAST:
40 return gfx::Insets(0, 8);
41 default:
42 return views::LayoutProvider::GetInsetsMetric(metric);
43 }
44 }
45
37 int ChromeLayoutProvider::GetDistanceMetric(int metric) const { 46 int ChromeLayoutProvider::GetDistanceMetric(int metric) const {
38 switch (metric) { 47 switch (metric) {
39 case DISTANCE_BUTTON_MINIMUM_WIDTH: 48 case DISTANCE_BUTTON_MINIMUM_WIDTH:
40 return 48; 49 return 48;
41 case DISTANCE_CONTROL_LIST_VERTICAL: 50 case DISTANCE_CONTROL_LIST_VERTICAL:
42 return GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL); 51 return GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL);
43 case DISTANCE_CONTROL_TOTAL_VERTICAL_TEXT_PADDING: 52 case DISTANCE_CONTROL_TOTAL_VERTICAL_TEXT_PADDING:
44 return 6; 53 return 6;
45 case DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL: 54 case DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL:
46 return 8; 55 return 8;
47 case DISTANCE_RELATED_CONTROL_VERTICAL_SMALL: 56 case DISTANCE_RELATED_CONTROL_VERTICAL_SMALL:
48 return 4; 57 return 4;
49 case DISTANCE_RELATED_LABEL_HORIZONTAL: 58 case DISTANCE_RELATED_LABEL_HORIZONTAL:
50 return 10; 59 return 10;
51 case DISTANCE_RELATED_LABEL_HORIZONTAL_LIST: 60 case DISTANCE_RELATED_LABEL_HORIZONTAL_LIST:
52 return 8; 61 return 8;
53 case DISTANCE_SUBSECTION_HORIZONTAL_INDENT: 62 case DISTANCE_SUBSECTION_HORIZONTAL_INDENT:
54 return 10; 63 return 10;
55 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL: 64 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL:
56 return 12; 65 return 12;
57 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL_LARGE: 66 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL_LARGE:
58 return 20; 67 return 20;
59 case DISTANCE_UNRELATED_CONTROL_VERTICAL_LARGE: 68 case DISTANCE_UNRELATED_CONTROL_VERTICAL_LARGE:
60 return 30; 69 return 30;
70 case DISTANCE_TOAST_CONTROL_VERTICAL:
71 return 8;
72 case DISTANCE_TOAST_LABEL_VERTICAL:
73 return 12;
61 default: 74 default:
62 return views::LayoutProvider::GetDistanceMetric(metric); 75 return views::LayoutProvider::GetDistanceMetric(metric);
63 } 76 }
64 } 77 }
65 78
66 const views::TypographyProvider& ChromeLayoutProvider::GetTypographyProvider() 79 const views::TypographyProvider& ChromeLayoutProvider::GetTypographyProvider()
67 const { 80 const {
68 // This is not a data member because then HarmonyLayoutProvider would inherit 81 // This is not a data member because then HarmonyLayoutProvider would inherit
69 // it, even when it provides its own. 82 // it, even when it provides its own.
70 CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ()); 83 CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ());
71 return legacy_provider; 84 return legacy_provider;
72 } 85 }
73 86
74 views::GridLayout::Alignment 87 views::GridLayout::Alignment
75 ChromeLayoutProvider::GetControlLabelGridAlignment() const { 88 ChromeLayoutProvider::GetControlLabelGridAlignment() const {
76 return views::GridLayout::TRAILING; 89 return views::GridLayout::TRAILING;
77 } 90 }
78 91
79 bool ChromeLayoutProvider::UseExtraDialogPadding() const { 92 bool ChromeLayoutProvider::UseExtraDialogPadding() const {
80 return true; 93 return true;
81 } 94 }
82 95
83 bool ChromeLayoutProvider::ShouldShowWindowIcon() const { 96 bool ChromeLayoutProvider::ShouldShowWindowIcon() const {
84 return true; 97 return true;
85 } 98 }
86 99
87 bool ChromeLayoutProvider::IsHarmonyMode() const { 100 bool ChromeLayoutProvider::IsHarmonyMode() const {
88 return false; 101 return false;
89 } 102 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/harmony/chrome_layout_provider.h ('k') | chrome/browser/ui/views/harmony/harmony_layout_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698