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

chrome/browser/ui/views/passwords/manage_password_items_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_password_items_view.h"
 
 #include <numeric>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 enum ColumnSets {
   ONE_COLUMN_SET,
   TWO_COLUMN_SET,
   THREE_COLUMN_SET
 };
 
 void BuildColumnSetIfNeeded(views::GridLayout* layout, int column_set_id) {
   if (layout->GetColumnSet(column_set_id))
     return;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
 
   // The username/"Deleted!"/Border field.
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
+
+  const int column_divider = ChromeLayoutProvider::Get()->GetDistanceMetric(
+      views::DISTANCE_RELATED_CONTROL_HORIZONTAL);
   if (column_set_id >= TWO_COLUMN_SET) {
     // The password/"Undo!" field.
-    column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
+    column_set->AddPaddingColumn(0, column_divider);
     column_set->AddColumn(views::GridLayout::FILL,
                           views::GridLayout::FILL,
                           1,
                           views::GridLayout::USE_PREF,
                           0,
                           0);
   }
   // If we're in manage-mode, we need another column for the delete button.
   if (column_set_id == THREE_COLUMN_SET) {
-    column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
+    column_set->AddPaddingColumn(0, column_divider);
     column_set->AddColumn(views::GridLayout::TRAILING,
                           views::GridLayout::FILL,
                           0,
                           views::GridLayout::USE_PREF,
                           0,
                           0);
   }
 }
 
 std::unique_ptr<views::Label> GenerateUsernameLabel(
     const autofill::PasswordForm& form) {
   std::unique_ptr<views::Label> label(
       new views::Label(GetDisplayUsername(form)));

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

CONTEXT_DEPRECATED_SMALL

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

Done.

-  label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
-      ui::ResourceBundle::SmallFont));
+  label->SetFontList(views::style::GetFont(views::style::CONTEXT_LABEL,
+                                           views::style::STYLE_PRIMARY));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   return label;
 }
 
 std::unique_ptr<views::Label> GeneratePasswordLabel(
     const autofill::PasswordForm& form) {
   base::string16 text =
       form.federation_origin.unique()
           ? form.password_value
           : l10n_util::GetStringFUTF16(
                 IDS_PASSWORDS_VIA_FEDERATION,
                 base::UTF8ToUTF16(form.federation_origin.host()));
   std::unique_ptr<views::Label> label(new views::Label(text));

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

CONTEXT_DEPRECATED_SMALL

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

Done.

-  label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
-      ui::ResourceBundle::SmallFont));
+  label->SetFontList(views::style::GetFont(views::style::CONTEXT_LABEL,
+                                           views::style::STYLE_PRIMARY));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   if (form.federation_origin.unique())
     label->SetObscured(true);
   return label;
 }
 
 std::unique_ptr<views::ImageButton> GenerateDeleteButton(
     views::ButtonListener* listener) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   std::unique_ptr<views::ImageButton> button(new views::ImageButton(listener));
   button->SetImage(views::ImageButton::STATE_NORMAL,
                    rb->GetImageNamed(IDR_CLOSE_2).ToImageSkia());
   button->SetImage(views::ImageButton::STATE_HOVERED,
                    rb->GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
   button->SetImage(views::ImageButton::STATE_PRESSED,
                    rb->GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
   button->SetFocusForPlatform();
   button->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETE));
   return button;
 }
 
 std::unique_ptr<views::Label> GenerateDeletedPasswordLabel() {
   std::unique_ptr<views::Label> text(new views::Label(

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

CONTEXT_DEPRECATED_SMALL

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

Done.

       l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED)));
   text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  text->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
-      ui::ResourceBundle::SmallFont));
+  text->SetFontList(views::style::GetFont(views::style::CONTEXT_LABEL,
+                                          views::style::STYLE_PRIMARY));
   return text;
 }
 
 std::unique_ptr<views::Link> GenerateUndoLink(views::LinkListener* listener) {
   std::unique_ptr<views::Link> undo_link(
       new views::Link(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO)));
   undo_link->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   undo_link->set_listener(listener);
   undo_link->SetUnderline(false);
-  undo_link->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
-      ui::ResourceBundle::SmallFont));
+  undo_link->SetFontList(views::style::GetFont(views::style::CONTEXT_LABEL,

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

CONTEXT_DEPRECATED_SMALL

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

Done.

+                                               views::style::STYLE_LINK));
   return undo_link;
 }
 
 }  // namespace
 
 // Manage credentials: stores credentials state and adds proper row to layout
 // based on credential state.
 class ManagePasswordItemsView::PasswordFormRow : public views::ButtonListener,
                                                  public views::LinkListener {
  public:
@@ skipping 146 matching lines @@
       base::MakeUnique<PasswordFormRow>(this, password_form, 0));
   AddRows();
 }
 
 ManagePasswordItemsView::~ManagePasswordItemsView() = default;
 
 void ManagePasswordItemsView::AddRows() {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   for (const std::unique_ptr<PasswordFormRow>& row : password_forms_rows_) {
-    if (row != password_forms_rows_[0])
-      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    if (row != password_forms_rows_[0]) {
+      layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(

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

ChromeLayoutProvider::Get() -> local var

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

Oops, thank you. I made DISTANCE_RELATED_CONTROL_VERTICAL a local var instead.

+                                   views::DISTANCE_RELATED_CONTROL_VERTICAL));
+    }
     row->AddRow(layout);
   }
   GetLayoutManager()->Layout(this);
 }
 
 void ManagePasswordItemsView::NotifyPasswordFormStatusChanged(
     const autofill::PasswordForm& password_form, bool deleted) {
   Refresh();
   // After the view is consistent, notify the model that the password needs to
   // be updated (either removed or put back into the store, as appropriate.
   model_->OnPasswordAction(password_form,
                            deleted
                                ? ManagePasswordsBubbleModel::REMOVE_PASSWORD
                                : ManagePasswordsBubbleModel::ADD_PASSWORD);
 }
 
 void ManagePasswordItemsView::Refresh() {
   DCHECK_NE(password_manager::ui::PENDING_PASSWORD_STATE, model_->state());
   RemoveAllChildViews(true);
   AddRows();
 }