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

chrome/browser/ui/views/passwords/credentials_selection_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/credentials_selection_view.h"
 
 #include <stddef.h>
 
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "ui/base/models/simple_combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 views::Label* GeneratePasswordLabel(const autofill::PasswordForm& form) {
   views::Label* label = new views::Label(form.password_value);

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

CONTEXT_DEPRECATED_SMALL to the constructor

[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_CENTER);
   label->SetObscured(true);
   return label;
 }
 
 }  // namespace
 
 CredentialsSelectionView::CredentialsSelectionView(
     ManagePasswordsBubbleModel* manage_passwords_bubble_model)
     : password_forms_(&manage_passwords_bubble_model->local_credentials()),
       default_index_(0),
       is_default_best_match_(false),
       is_default_preferred_(false),
       action_reported_(false) {
   DCHECK(!password_forms_->empty());
 
   // Layout.
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   // ColumnSet.
   int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::FIXED, 0, 0);
-  column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
+  ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
+  const int inner_padding =
+      layout_provider->GetDistanceMetric(DISTANCE_RELATED_LABEL_HORIZONTAL);
+  column_set->AddPaddingColumn(0, inner_padding);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::FIXED, 0, 0);
-  column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
+  column_set->AddPaddingColumn(0, inner_padding);
 
   // The username combobox and password label.
   layout->StartRowWithPadding(0, column_set_id, 0,
-                              views::kRelatedControlVerticalSpacing);
+                              layout_provider->GetDistanceMetric(
+                                  views::DISTANCE_RELATED_CONTROL_VERTICAL));

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

Deleted this, because I realised that this is 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()).

   GenerateUsernameCombobox(
       manage_passwords_bubble_model->pending_password().username_value);
   layout->AddView(combobox_.get());
   views::Label* label =
       GeneratePasswordLabel(manage_passwords_bubble_model->pending_password());
   layout->AddView(label);
 
   GetLayoutManager()->Layout(this);
 }
 
@@ skipping 78 matching lines @@
           DEFAULT_ACCOUNT_PREFERRED_USER_CHANGED;
     } else {
       action =
           password_manager::metrics_util::DEFAULT_ACCOUNT_FIRST_USER_CHANGED;
     }
   }
 
   password_manager::metrics_util::LogMultiAccountUpdateBubbleUserAction(action);
   action_reported_ = true;
 }