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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/passwords/account_chooser_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
+#include "ui/views/style/typography.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Maximum height of the credential list. The unit is one row's height.
 constexpr double kMaxHeightAccounts = 3.5;
 
 constexpr int kVerticalAvatarMargin = 8;
 
 // An identifier for views::ColumnSet.
 enum ColumnSetType {
   SINGLE_VIEW_COLUMN_SET,
   SINGLE_VIEW_COLUMN_SET_NO_PADDING,
 };
 
 // Construct a |type| ColumnSet and add it to |layout|.
 void BuildColumnSet(ColumnSetType type, views::GridLayout* layout) {
   views::ColumnSet* column_set = layout->AddColumnSet(type);
-  bool padding = (type == SINGLE_VIEW_COLUMN_SET);
-  if (padding)
-    column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+  const int horizontal_padding =
+      type == SINGLE_VIEW_COLUMN_SET
+          ? ChromeLayoutProvider::Get()->GetDistanceMetric(
+                DISTANCE_DIALOG_BUTTON_MARGIN)
+          : 0;
+  column_set->AddPaddingColumn(0, horizontal_padding);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
-  if (padding)
-    column_set->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+  column_set->AddPaddingColumn(0, horizontal_padding);
 }
 
 views::StyledLabel::RangeStyleInfo GetLinkStyle() {
   auto result = views::StyledLabel::RangeStyleInfo::CreateForLink();
   result.disable_line_wrapping = false;
   return result;
 }
 
 Profile* GetProfileFromWebContents(content::WebContents* web_contents) {
   if (!web_contents)
@@ skipping 10 matching lines @@
   list_view->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   int item_height = 0;
   for (const auto& form : forms) {
     std::pair<base::string16, base::string16> titles =
         GetCredentialLabelsForAccountChooser(*form);
     CredentialsItemView* credential_view = new CredentialsItemView(
         button_listener, titles.first, titles.second, kButtonHoverColor,
         form.get(), request_context);
     credential_view->SetLowerLabelColor(kAutoSigninTextColor);
-    credential_view->SetBorder(views::CreateEmptyBorder(
-        kVerticalAvatarMargin, views::kButtonHEdgeMarginNew,
-        kVerticalAvatarMargin, views::kButtonHEdgeMarginNew));
+    const int horizontal_padding =
+        ChromeLayoutProvider::Get()->GetDistanceMetric(
+            DISTANCE_DIALOG_BUTTON_MARGIN);
+    credential_view->SetBorder(
+        views::CreateEmptyBorder(kVerticalAvatarMargin, horizontal_padding,
+                                 kVerticalAvatarMargin, horizontal_padding));
     item_height = std::max(item_height, credential_view->GetPreferredHeight());
     list_view->AddChildView(credential_view);
   }
   views::ScrollView* scroll_view = new views::ScrollView;
   scroll_view->ClipHeightTo(0, kMaxHeightAccounts * item_height);
   scroll_view->SetContents(list_view);
   return scroll_view;
 }
 
 }  // namespace
@@ skipping 94 matching lines @@
 void AccountChooserDialogView::InitWindow() {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   BuildColumnSet(SINGLE_VIEW_COLUMN_SET, layout);
 
   // Create the title.
   std::pair<base::string16, gfx::Range> title_content =
       controller_->GetAccoutChooserTitle();
   views::StyledLabel* title_label =
       new views::StyledLabel(title_content.first, this);
-  title_label->SetBaseFontList(
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::MediumFont));
-  if (!title_content.second.is_empty()) {
+  title_label->SetBaseFontList(views::style::GetFont(
+      views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
+  if (!title_content.second.is_empty())
     title_label->AddStyleRange(title_content.second, GetLinkStyle());
-  }
-  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0, kTitleTopInset);
+
+  // Show the title.
+  ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
+  layout->StartRowWithPadding(
+      0, SINGLE_VIEW_COLUMN_SET, 0,
+      layout_provider->GetInsetsMetric(views::INSETS_BUBBLE_TITLE).top());
   layout->AddView(title_label);
-  layout->AddPaddingRow(0, 2*views::kRelatedControlVerticalSpacing);
 
   // Show credentials.
+  gfx::Insets bubble_insets =
+      layout_provider->GetInsetsMetric(views::INSETS_BUBBLE_CONTENTS);
   BuildColumnSet(SINGLE_VIEW_COLUMN_SET_NO_PADDING, layout);
-  layout->StartRow(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING);
+  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING, 0,
+                              bubble_insets.top());
   layout->AddView(CreateCredentialsView(
       controller_->GetLocalForms(),
       this,
       GetProfileFromWebContents(web_contents_)->GetRequestContext()));
-  // DialogClientView adds kRelatedControlVerticalSpacing padding once more for
-  // the buttons.
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  // DialogClientView adds more vertical padding for space above the buttons.

[tapted, 2017/05/12 03:36:10]

nit: this comment probably not needed, since `bubble_insets.bottom()` makes
sense on its own IMO

[Patti Lor, 2017/05/15 01:53:48]

Done.

+  layout->AddPaddingRow(0, bubble_insets.bottom());
+  layout->AddPaddingRow(

[tapted, 2017/05/12 03:36:10]

did you mean to keep this second row? (if DialogClientView should add this if
GetDialogButtons returns something, otherwise this should be added closer to
where the buttons are added as subviews)

[Patti Lor, 2017/05/15 01:53:48]

Deleted! Thanks :)

+      0, layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON).top());
 }
 
 AccountChooserPrompt* CreateAccountChooserPromptView(
     PasswordDialogController* controller, content::WebContents* web_contents) {
   return new AccountChooserDialogView(controller, web_contents);
 }