Harmonizing SmartLock dialog

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

 // Copyright 2014 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_item_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/autofill/core/common/password_form.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/tooltip_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
-// The default spacing between the icon and text.
-const int kSpacing = 12;
 
 gfx::Size GetTextLabelsSize(const views::Label* upper_label,
                             const views::Label* lower_label) {
   gfx::Size upper_label_size = upper_label ? upper_label->GetPreferredSize()
                                            : gfx::Size();
   gfx::Size lower_label_size = lower_label ? lower_label->GetPreferredSize()
                                            : gfx::Size();
   return gfx::Size(std::max(upper_label_size.width(), lower_label_size.width()),
                    upper_label_size.height() + lower_label_size.height());
 }
@@ skipping 50 matching lines @@
   if (form_->icon_url.is_valid()) {
     // Fetch the actual avatar.
     AccountAvatarFetcher* fetcher = new AccountAvatarFetcher(
         form_->icon_url, weak_ptr_factory_.GetWeakPtr());
     fetcher->Start(request_context);
   }
   AddChildView(image_view_);
 
   // TODO(tapted): Check these (and the STYLE_ values below) against the spec on
   // http://crbug.com/651681.
-  const int kLabelContext =
-      ui::MaterialDesignController::IsSecondaryUiMaterial()
-          ? CONTEXT_BODY_TEXT_SMALL
-          : CONTEXT_DEPRECATED_SMALL;
+  const int kLabelContext = ChromeLayoutProvider::Get()->IsHarmonyMode()
+                                ? CONTEXT_BODY_TEXT_SMALL
+                                : CONTEXT_DEPRECATED_SMALL;
 
   if (!upper_text.empty()) {
     upper_label_ = new views::Label(upper_text, kLabelContext,
                                     views::style::STYLE_PRIMARY);
     upper_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(upper_label_);
   }
 
   if (!lower_text.empty()) {
     lower_label_ = new views::Label(lower_text, kLabelContext, STYLE_SECONDARY);
@@ skipping 34 matching lines @@
 int CredentialsItemView::GetPreferredHeight() const {
   return GetPreferredSize().height();
 }
 
 gfx::Size CredentialsItemView::GetPreferredSize() const {
   gfx::Size labels_size = GetTextLabelsSize(upper_label_, lower_label_);
   gfx::Size size = gfx::Size(kAvatarImageSize + labels_size.width(),
                              std::max(kAvatarImageSize, labels_size.height()));
   const gfx::Insets insets(GetInsets());
   size.Enlarge(insets.width(), insets.height());
-  size.Enlarge(kSpacing, 0);
+  size.Enlarge(ChromeLayoutProvider::Get()->GetDistanceMetric(
+                   DISTANCE_UNRELATED_CONTROL_HORIZONTAL),
+               0);
 
   // Make the size at least as large as the minimum size needed by the border.
   size.SetToMax(border() ? border()->GetMinimumSize() : gfx::Size());
   return size;
 }
 
 int CredentialsItemView::GetHeightForWidth(int w) const {
   return View::GetHeightForWidth(w);
 }
 
 void CredentialsItemView::Layout() {
   gfx::Rect child_area(GetLocalBounds());
   child_area.Inset(GetInsets());
 
   gfx::Size image_size(image_view_->GetPreferredSize());
   image_size.SetToMin(child_area.size());
   gfx::Point image_origin(child_area.origin());
   image_origin.Offset(0, (child_area.height() - image_size.height()) / 2);
   image_view_->SetBoundsRect(gfx::Rect(image_origin, image_size));
 
   gfx::Size upper_size =
       upper_label_ ? upper_label_->GetPreferredSize() : gfx::Size();
   gfx::Size lower_size =
       lower_label_ ? lower_label_->GetPreferredSize() : gfx::Size();
   int y_offset = (child_area.height() -
       (upper_size.height() + lower_size.height())) / 2;
-  gfx::Point label_origin(image_origin.x() + image_size.width() + kSpacing,
+  gfx::Point label_origin(image_origin.x() + image_size.width() +
+                              ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                  DISTANCE_UNRELATED_CONTROL_HORIZONTAL),
                           child_area.origin().y() + y_offset);
   if (upper_label_)
     upper_label_->SetBoundsRect(gfx::Rect(label_origin, upper_size));
   if (lower_label_) {
     label_origin.Offset(0, upper_size.height());
     lower_label_->SetBoundsRect(gfx::Rect(label_origin, lower_size));
   }
   if (info_icon_) {
     info_icon_->SizeToPreferredSize();
     info_icon_->SetPosition(
         gfx::Point(child_area.right() - info_icon_->width(),
                    child_area.CenterPoint().y() - info_icon_->height() / 2));
   }
 }
 
 void CredentialsItemView::OnPaint(gfx::Canvas* canvas) {
   if (state() == STATE_PRESSED || state() == STATE_HOVERED)
     canvas->DrawColor(hover_color_);
 
   CustomButton::OnPaint(canvas);
 }