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

Unified Diff: chrome/browser/ui/views/harmony/harmony_layout_delegate.cc

Issue 2660553005: Harmony - convert hung renderer dialog. (Closed)
Patch Set: disable dialog test on osx Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.cc ('k') | chrome/browser/ui/views/harmony/layout_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
diff --git a/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc b/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
index eb1744312dc81b417ddc686c76ef3fcb861ada54..45cb24b059f216a32cfa5b124dbefd104427b4c7 100644
--- a/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
+++ b/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
@@ -17,8 +17,14 @@ HarmonyLayoutDelegate* HarmonyLayoutDelegate::Get() {
int HarmonyLayoutDelegate::GetMetric(Metric metric) const {
switch (metric) {
+ case Metric::BUTTON_HORIZONTAL_PADDING:
+ return kHarmonyLayoutUnit;
case Metric::DIALOG_BUTTON_MARGIN:
return kHarmonyLayoutUnit;
+ case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
+ // Minimum label size plus padding.
+ return 2 * kHarmonyLayoutUnit +
+ 2 * GetMetric(Metric::BUTTON_HORIZONTAL_PADDING);
case Metric::DIALOG_BUTTON_TOP_SPACING:
return kHarmonyLayoutUnit;
case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
@@ -37,6 +43,10 @@ int HarmonyLayoutDelegate::GetMetric(Metric metric) const {
return kHarmonyLayoutUnit;
case Metric::SUBSECTION_HORIZONTAL_INDENT:
return 0;
+ case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING:
+ return kHarmonyLayoutUnit;
+ case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING_LARGE:
+ return kHarmonyLayoutUnit;
case Metric::UNRELATED_CONTROL_VERTICAL_SPACING:
return kHarmonyLayoutUnit;
case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.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