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

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

 // Copyright 2013 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/manage_passwords_bubble_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
@@ skipping 21 matching lines @@
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.h"
 #endif
 
@@ skipping 29 matching lines @@
   TRIPLE_BUTTON_COLUMN_SET,
 };
 
 enum TextRowType { ROW_SINGLE, ROW_MULTILINE };
 
 // Construct an appropriate ColumnSet for the given |type|, and add it
 // to |layout|.
 void BuildColumnSet(views::GridLayout* layout, ColumnSetType type) {
   views::ColumnSet* column_set = layout->AddColumnSet(type);
   int full_width = ManagePasswordsBubbleView::kDesiredBubbleWidth;
+  const int button_divider = ChromeLayoutProvider::Get()->GetDistanceMetric(
+      views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
   switch (type) {
     case SINGLE_VIEW_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::FILL,
                             views::GridLayout::FILL,
                             0,
                             views::GridLayout::FIXED,
                             full_width,
                             0);
       break;
     case DOUBLE_BUTTON_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             1,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
-      column_set->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
+      column_set->AddPaddingColumn(0, button_divider);
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             0,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
       break;
     case LINK_BUTTON_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::LEADING,
                             views::GridLayout::CENTER,
                             1,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
-      column_set->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
+      column_set->AddPaddingColumn(0, button_divider);
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             0,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
       break;
     case SINGLE_BUTTON_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             1,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
       break;
     case TRIPLE_BUTTON_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::LEADING,
                             views::GridLayout::CENTER,
                             1,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
-      column_set->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
+      column_set->AddPaddingColumn(0, button_divider);
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             0,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
-      column_set->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
+      column_set->AddPaddingColumn(0, button_divider);
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             0,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
       break;
   }
 }
 
 views::StyledLabel::RangeStyleInfo GetLinkStyle() {
   auto result = views::StyledLabel::RangeStyleInfo::CreateForLink();
   result.disable_line_wrapping = false;
   return result;
 }
 
 // If a special title is required (i.e. one that contains links), creates a
 // title view and a row for it in |layout|.
 // TODO(estade): this should be removed and a replaced by a normal title (via
 // GetWindowTitle).
 void AddTitleRowWithLink(views::GridLayout* layout,
                          ManagePasswordsBubbleModel* model,
                          views::StyledLabelListener* listener) {
   if (model->title_brand_link_range().is_empty())
     return;
 
   views::StyledLabel* title_label =
       new views::StyledLabel(model->title(), listener);
-  title_label->SetBaseFontList(
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::MediumFont));
+  title_label->SetBaseFontList(views::style::GetFont(
+      views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
   title_label->AddStyleRange(model->title_brand_link_range(), GetLinkStyle());
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(title_label);
-  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                               DISTANCE_UNRELATED_CONTROL_VERTICAL));

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

INSETS_BUBBLE_CONTENTS.top()?

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

Done. I also went ahead and changed other places where there was padding between
the title and content / content and buttons.

 }
 
 }  // namespace
 
 // ManagePasswordsBubbleView::AutoSigninView ----------------------------------
 
 // A view containing just one credential that was used for for automatic signing
 // in.
 class ManagePasswordsBubbleView::AutoSigninView
     : public views::View,
@@ skipping 132 matching lines @@
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BUBBLE_BLACKLIST_BUTTON));
 
   // Title row.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   if (item) {
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(item);
-    layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                 DISTANCE_UNRELATED_CONTROL_VERTICAL));

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

INSETS_BUBBLE_CONTENTS.bottom()?

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

Done, + button insets top below.

   }
 
   // Button row.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
   layout->StartRow(0, DOUBLE_BUTTON_COLUMN_SET);
   layout->AddView(save_button_);
   layout->AddView(never_button_);
 
   parent_->set_initially_focused_view(save_button_);
 }
@@ skipping 51 matching lines @@
   views::Link* manage_link_;
   views::Button* done_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ManageView);
 };
 
 ManagePasswordsBubbleView::ManageView::ManageView(
     ManagePasswordsBubbleView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
+  const int vertical_padding = ChromeLayoutProvider::Get()->GetDistanceMetric(
+      DISTANCE_UNRELATED_CONTROL_VERTICAL);
   layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
   SetLayoutManager(layout);
+  BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
+  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0, vertical_padding);

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

INSETS_BUBBLE_CONTENTS.top()?

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

Deleted this, because this is also always beneath the title (which
already has padding under it, either handled by the dialog delegate or by
manage_passwords_bubble_view.cc's AddTitleRowLink()).

 
   // If we have a list of passwords to store for the current site, display
   // them to the user for management. Otherwise, render a "No passwords for
   // this site" message.
-  BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   if (!parent_->model()->local_credentials().empty()) {
     ManagePasswordItemsView* item = new ManagePasswordItemsView(
         parent_->model(), &parent_->model()->local_credentials());
-    layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0,
-                                views::kUnrelatedControlVerticalSpacing);
     layout->AddView(item);
   } else {
     views::Label* empty_label = new views::Label(
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_NO_PASSWORDS));

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

DEPRECATED_SMALL

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

Done.

     empty_label->SetMultiLine(true);
     empty_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    empty_label->SetFontList(
-        ui::ResourceBundle::GetSharedInstance().GetFontList(
-            ui::ResourceBundle::SmallFont));
-
-    layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0,
-                                views::kUnrelatedControlVerticalSpacing);
+    empty_label->SetFontList(views::style::GetFont(
+        views::style::CONTEXT_LABEL, views::style::STYLE_PRIMARY));
     layout->AddView(empty_label);
   }
 
   // Then add the "manage passwords" link and "Done" button.
   manage_link_ = new views::Link(parent_->model()->manage_link());
   manage_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   manage_link_->SetUnderline(false);
   manage_link_->set_listener(this);
 
   done_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_DONE));
 
   BuildColumnSet(layout, LINK_BUTTON_COLUMN_SET);
-  layout->StartRowWithPadding(0, LINK_BUTTON_COLUMN_SET, 0,
-                              views::kUnrelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(0, LINK_BUTTON_COLUMN_SET, 0, vertical_padding);

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

INSETS_BUBBLE_CONTENTS.bottom()?

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

Done,  + button insets top

   layout->AddView(manage_link_);
   layout->AddView(done_button_);
 
   parent_->set_initially_focused_view(done_button_);
 }
 
 ManagePasswordsBubbleView::ManageView::~ManageView() {
 }
 
 void ManagePasswordsBubbleView::ManageView::ButtonPressed(
@@ skipping 40 matching lines @@
 
 ManagePasswordsBubbleView::SaveConfirmationView::SaveConfirmationView(
     ManagePasswordsBubbleView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
   SetLayoutManager(layout);
 
   views::StyledLabel* confirmation =
       new views::StyledLabel(parent_->model()->save_confirmation_text(), this);
-  confirmation->SetBaseFontList(
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::SmallFont));
+  confirmation->SetBaseFontList(views::style::GetFont(
+      views::style::CONTEXT_LABEL, views::style::STYLE_PRIMARY));

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

DEPRECATED_SMALL

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

Done.

   confirmation->AddStyleRange(
       parent_->model()->save_confirmation_link_range(), GetLinkStyle());
 
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(confirmation);
 
   ok_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_OK));
 
   BuildColumnSet(layout, SINGLE_BUTTON_COLUMN_SET);
-  layout->StartRowWithPadding(
-      0, SINGLE_BUTTON_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(0, SINGLE_BUTTON_COLUMN_SET, 0,
+                              ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                  views::DISTANCE_RELATED_CONTROL_VERTICAL));

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

Changed this to bubble contents bottom + button row top.

   layout->AddView(ok_button_);
 
   parent_->set_initially_focused_view(ok_button_);
 }
 
 ManagePasswordsBubbleView::SaveConfirmationView::~SaveConfirmationView() {
 }
 
 void ManagePasswordsBubbleView::SaveConfirmationView::StyledLabelLinkClicked(
     views::StyledLabel* label,
@@ skipping 129 matching lines @@
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(item);
 
   // Button row.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
   layout->StartRowWithPadding(0, DOUBLE_BUTTON_COLUMN_SET, 0,
-                              views::kUnrelatedControlVerticalSpacing);
+                              ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                  DISTANCE_UNRELATED_CONTROL_VERTICAL));

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

INSETS_BUBBLE_CONTENTS.bottom()?

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

Done + button row top.

   layout->AddView(update_button_);
   layout->AddView(nope_button_);
 
   parent_->set_initially_focused_view(update_button_);
 }
 
 ManagePasswordsBubbleView::UpdatePendingView::~UpdatePendingView() {}
 
 void ManagePasswordsBubbleView::UpdatePendingView::ButtonPressed(
     views::Button* sender,
@@ skipping 192 matching lines @@
   } else if (model_.state() ==
              password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     AddChildView(new DesktopIOSPromotionBubbleView(
         model_.GetProfile(),
         desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE));
 #endif
   } else {
     AddChildView(new ManageView(this));
   }
 }