Views/Harmony: Remove references to layout constants in c/b/u/v/passwords.

chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc

Index: chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc
diff --git a/chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc b/chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc
index 1b2b28947fa9da219f51071b97a40dc2e0989525..531a3aaf2468b4b481c7ff9713f939cd1e8cff53 100644
--- a/chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc
+++ b/chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.h"
 
 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -12,7 +13,6 @@
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ -31,7 +31,10 @@ enum ColumnSetType {
 // to |layout|.
 void BuildColumnSet(views::GridLayout* layout, ColumnSetType type) {
   views::ColumnSet* column_set = layout->AddColumnSet(type);
-  column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+  ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
+  const int horizontal_padding =
+      layout_provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
+  column_set->AddPaddingColumn(0, horizontal_padding);
   switch (type) {
     case SINGLE_VIEW_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::FILL,
@@ -48,7 +51,9 @@ void BuildColumnSet(views::GridLayout* layout, ColumnSetType type) {
                             views::GridLayout::USE_PREF,
                             0,
                             0);
-      column_set->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
+      column_set->AddPaddingColumn(
+          0, layout_provider->GetDistanceMetric(
+                 views::DISTANCE_RELATED_BUTTON_HORIZONTAL));
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             0,
@@ -57,7 +62,7 @@ void BuildColumnSet(views::GridLayout* layout, ColumnSetType type) {
                             0);
       break;
   }
-  column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+  column_set->AddPaddingColumn(0, horizontal_padding);
 }
 
 }  // namespace
@@ -138,6 +143,11 @@ void AutoSigninFirstRunDialogView::StyledLabelLinkClicked(
 }
 
 void AutoSigninFirstRunDialogView::InitWindow() {
+  ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
+  const int vertical_margin =
+      layout_provider->GetDistanceMetric(DISTANCE_PANEL_CONTENT_MARGIN);
+  const int vertical_padding =
+      layout_provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL);
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
@@ -145,9 +155,9 @@ void AutoSigninFirstRunDialogView::InitWindow() {
   // Title.
   views::Label* title_label = new views::Label(GetWindowTitle());
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  title_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
-      ui::ResourceBundle::MediumFont));
-  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0, kTitleTopInset);
+  title_label->SetFontList(views::style::GetFont(

[tapted, 2017/05/10 05:30:11]

this is a vanilla views::Label, so views::style::CONTEXT_DIALOG_TITLE can be
passed in to the constructor two lines above (and this line removed)

[Patti Lor, 2017/05/11 06:59:18]

Done.

+      views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
+  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0, vertical_margin);

[tapted, 2017/05/10 05:30:11]

INSETS_BUBBLE_TITLE.top()

[Patti Lor, 2017/05/11 06:59:18]

Done.

   layout->AddView(title_label);
 
   // Content.
@@ -155,9 +165,8 @@ void AutoSigninFirstRunDialogView::InitWindow() {
       controller_->GetAutoSigninText();
   views::StyledLabel* content_label =
       new views::StyledLabel(text_content.first, this);
-  content_label->SetBaseFontList(
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::SmallFont));
+  content_label->SetBaseFontList(views::style::GetFont(
+      views::style::CONTEXT_LABEL, views::style::STYLE_PRIMARY));

[tapted, 2017/05/10 05:30:11]

I think this needs to be CONTEXT_DEPRECATED_SMALL to retain the old behaviour

[Patti Lor, 2017/05/11 06:59:18]

Done.

   views::StyledLabel::RangeStyleInfo default_style;
   default_style.color = kAutoSigninTextColor;
   content_label->SetDefaultStyle(default_style);
@@ -166,21 +175,19 @@ void AutoSigninFirstRunDialogView::InitWindow() {
         text_content.second,
         views::StyledLabel::RangeStyleInfo::CreateForLink());
   }
-  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0,
-                              2 * views::kRelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0, vertical_padding);

[tapted, 2017/05/10 05:30:11]

bring const int vertical_padding = .. DISTANCE_UNRELATED_CONTROL_VERTICAL down
here.

[Patti Lor, 2017/05/11 06:59:18]

Done, I separated the view creation and layout.

   layout->AddView(content_label);
 
   // Buttons.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
-  layout->StartRowWithPadding(0, DOUBLE_BUTTON_COLUMN_SET, 0,
-                              3 * views::kRelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(0, DOUBLE_BUTTON_COLUMN_SET, 0, vertical_padding);

[tapted, 2017/05/10 05:30:11]

The old code was 3*related, not 2*related, so there is a behaviour change here -
is that intentional?

[Patti Lor, 2017/05/11 06:59:18]

Kinda? I guess I was trying to following a precedent pkasting set in a previous
CL where he was OK with changing the current behaviour if it was more "correct",
and the multiplier here seemed kinda arbitrary to me. I'll defer to your
opinion, so let me know what you think?

(For now, I switched to using the top inset for dialog buttons.)

   ok_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_AUTO_SIGNIN_FIRST_RUN_OK));
   turn_off_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_AUTO_SIGNIN_FIRST_RUN_TURN_OFF));
   layout->AddView(ok_button_);
   layout->AddView(turn_off_button_);
-  layout->AddPaddingRow(0, views::kButtonVEdgeMarginNew);
+  layout->AddPaddingRow(0, vertical_margin);

[tapted, 2017/05/10 05:30:11]

GetInsetsMetric(views::INSETS_DIALOG_BUTTON).bottom()

[Patti Lor, 2017/05/11 06:59:18]

Done.

 }
 
 AutoSigninFirstRunPrompt* CreateAutoSigninPromptView(