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

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

Issue 2625083003: Implement Harmony-style consistent button widths for Collected Cookies. (Closed)
Patch Set: respond to comments Created 3 years, 9 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/harmony_layout_delegate.h" 5 #include "chrome/browser/ui/views/harmony/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 9
10 static base::LazyInstance<HarmonyLayoutDelegate> harmony_layout_delegate_ = 10 static base::LazyInstance<HarmonyLayoutDelegate> harmony_layout_delegate_ =
11 LAZY_INSTANCE_INITIALIZER; 11 LAZY_INSTANCE_INITIALIZER;
12 12
13 // static 13 // static
14 HarmonyLayoutDelegate* HarmonyLayoutDelegate::Get() { 14 HarmonyLayoutDelegate* HarmonyLayoutDelegate::Get() {
15 return harmony_layout_delegate_.Pointer(); 15 return harmony_layout_delegate_.Pointer();
16 } 16 }
17 17
18 int HarmonyLayoutDelegate::GetMetric(Metric metric) const { 18 int HarmonyLayoutDelegate::GetMetric(Metric metric) const {
19 switch (metric) { 19 switch (metric) {
20 case Metric::BUTTON_HORIZONTAL_PADDING: 20 case Metric::BUTTON_HORIZONTAL_PADDING:
21 return kHarmonyLayoutUnit; 21 return kHarmonyLayoutUnit;
22 case Metric::DIALOG_BUTTON_MARGIN: 22 case Metric::DIALOG_BUTTON_MARGIN:
23 return kHarmonyLayoutUnit; 23 return kHarmonyLayoutUnit;
24 case Metric::BUTTON_MAX_LINKABLE_WIDTH:
25 return kHarmonyLayoutUnit * 8;
24 case Metric::BUTTON_MINIMUM_WIDTH: 26 case Metric::BUTTON_MINIMUM_WIDTH:
25 case Metric::DIALOG_BUTTON_MINIMUM_WIDTH: 27 case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
26 // Minimum label size plus padding. 28 // Minimum label size plus padding.
27 return 2 * kHarmonyLayoutUnit + 29 return 2 * kHarmonyLayoutUnit +
28 2 * GetMetric(Metric::BUTTON_HORIZONTAL_PADDING); 30 2 * GetMetric(Metric::BUTTON_HORIZONTAL_PADDING);
29 case Metric::DIALOG_BUTTON_TOP_SPACING: 31 case Metric::DIALOG_BUTTON_TOP_SPACING:
30 return kHarmonyLayoutUnit; 32 return kHarmonyLayoutUnit;
31 case Metric::DIALOG_CLOSE_BUTTON_MARGIN: 33 case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
32 // TODO(pkasting): The "- 4" here is a hack that matches the extra padding 34 // TODO(pkasting): The "- 4" here is a hack that matches the extra padding
33 // in vector_icon_button.cc and should be removed when that padding is. 35 // in vector_icon_button.cc and should be removed when that padding is.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 case DialogWidth::SMALL: 77 case DialogWidth::SMALL:
76 return 320; 78 return 320;
77 case DialogWidth::MEDIUM: 79 case DialogWidth::MEDIUM:
78 return 448; 80 return 448;
79 case DialogWidth::LARGE: 81 case DialogWidth::LARGE:
80 return 512; 82 return 512;
81 } 83 }
82 NOTREACHED(); 84 NOTREACHED();
83 return 0; 85 return 0;
84 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/collected_cookies_views.cc ('k') | chrome/browser/ui/views/harmony/layout_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698