Replace layout constants in chrome/browser/ui/views/infobars.

chrome/browser/ui/views/infobars/infobar_view.cc

 // Copyright (c) 2012 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/infobars/infobar_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/infobar_container_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/vector_icons/vector_icons.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/image_button_factory.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/menu/menu_runner.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
-const int kEdgeItemPadding = views::kRelatedControlHorizontalSpacing;
-const int kIconToLabelSpacing = views::kRelatedControlHorizontalSpacing;
-const int kBeforeCloseButtonSpacing = views::kUnrelatedControlHorizontalSpacing;
-
 bool SortLabelsByDecreasingWidth(views::Label* label_1, views::Label* label_2) {
   return label_1->GetPreferredSize().width() >
       label_2->GetPreferredSize().width();
 }
 
 constexpr SkColor GetInfobarTextColor() {
   return SK_ColorBLACK;
 }
 
 }  // namespace
@@ skipping 62 matching lines @@
   AssignWidthsSorted(labels, available_width);
 }
 
 void InfoBarView::Layout() {
   child_container_->SetBounds(
       0, arrow_height(), width(),
       bar_height() - InfoBarContainerDelegate::kSeparatorLineHeight);
   // |child_container_| should be the only child.
   DCHECK_EQ(1, child_count());
 
+  int related_control_distance_horizontal =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          views::DISTANCE_RELATED_CONTROL_HORIZONTAL);
+  int unrelated_control_distance_horizontal =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          DISTANCE_UNRELATED_CONTROL_HORIZONTAL);
   // Even though other views are technically grandchildren, we'll lay them out
   // here on behalf of |child_container_|.
-  int start_x = kEdgeItemPadding;
+  int start_x = related_control_distance_horizontal;
   if (icon_ != NULL) {
     icon_->SetPosition(gfx::Point(start_x, OffsetY(icon_)));
-    start_x = icon_->bounds().right() + kIconToLabelSpacing;
+    start_x = icon_->bounds().right() + related_control_distance_horizontal;
   }
 
   int content_minimum_width = ContentMinimumWidth();
   close_button_->SizeToPreferredSize();
-  close_button_->SetPosition(gfx::Point(
-      std::max(
-          start_x + content_minimum_width +
-              ((content_minimum_width > 0) ? kBeforeCloseButtonSpacing : 0),
-          width() - kEdgeItemPadding - close_button_->width()),
-      OffsetY(close_button_)));
+  close_button_->SetPosition(
+      gfx::Point(std::max(start_x + content_minimum_width +
+                              ((content_minimum_width > 0)
+                                   ? unrelated_control_distance_horizontal
+                                   : 0),
+                          width() - related_control_distance_horizontal -
+                              close_button_->width()),
+                 OffsetY(close_button_)));
 
   // For accessibility reasons, the close button should come last.
   DCHECK_EQ(close_button_->parent()->child_count() - 1,
             close_button_->parent()->GetIndexOf(close_button_));
 }
 
 void InfoBarView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   View::ViewHierarchyChanged(details);
 
@@ skipping 38 matching lines @@
 }
 
 int InfoBarView::ContentMinimumWidth() const {
   return 0;
 }
 
 int InfoBarView::StartX() const {
   // Ensure we don't return a value greater than EndX(), so children can safely
   // set something's width to "EndX() - StartX()" without risking that being
   // negative.
-  return std::min(EndX(), (icon_ != NULL) ?
-      (icon_->bounds().right() + kIconToLabelSpacing) : kEdgeItemPadding);
+  int related_control_horizontal_spacing =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          views::DISTANCE_RELATED_CONTROL_HORIZONTAL);
+  return std::min(EndX(), (icon_ != NULL) ? (icon_->bounds().right() +
+                                             related_control_horizontal_spacing)
+                                          : related_control_horizontal_spacing);

[Peter Kasting, 2017/04/14 07:42:32]

Nit: Simpler:

  const int padding = ChromeLayoutProvider::Get()->GetDistanceMetric(
                          views::DISTANCE_RELATED_CONTROL_HORIZONTAL);
  return std::min((icon_ ? icon_->bounds().right() : 0) + padding, EndX());

[ananta, 2017/04/14 18:32:33]

Done.

 }
 
 int InfoBarView::EndX() const {
-  return close_button_->x() - kBeforeCloseButtonSpacing;
+  return close_button_->x() - ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                  DISTANCE_UNRELATED_CONTROL_HORIZONTAL);
 }
 
 int InfoBarView::OffsetY(views::View* view) const {
   return std::max((bar_target_height() - view->height()) / 2, 0) -
          (bar_target_height() - bar_height());
 }
 
 void InfoBarView::AddViewToContentArea(views::View* view) {
   child_container_->AddChildView(view);
 }
@@ skipping 50 matching lines @@
 void InfoBarView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->SetName(l10n_util::GetStringUTF8(
       (delegate()->GetInfoBarType() == infobars::InfoBarDelegate::WARNING_TYPE)
           ? IDS_ACCNAME_INFOBAR_WARNING
           : IDS_ACCNAME_INFOBAR_PAGE_ACTION));
   node_data->role = ui::AX_ROLE_ALERT;
   node_data->AddStringAttribute(ui::AX_ATTR_SHORTCUT, "Alt+Shift+A");
 }
 
 gfx::Size InfoBarView::GetPreferredSize() const {
+  int related_control_horizontal_spacing =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          views::DISTANCE_RELATED_CONTROL_HORIZONTAL);
+  int unrelated_control_horizontal_spacing =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          DISTANCE_UNRELATED_CONTROL_HORIZONTAL);
   return gfx::Size(
-      kEdgeItemPadding + (icon_ ? (icon_->width() + kIconToLabelSpacing) : 0) +
-          ContentMinimumWidth() + kBeforeCloseButtonSpacing +
-          close_button_->width() + kEdgeItemPadding,
+      related_control_horizontal_spacing +
+          (icon_ ? (icon_->width() + related_control_horizontal_spacing) : 0) +
+          ContentMinimumWidth() + unrelated_control_horizontal_spacing +
+          close_button_->width() + related_control_horizontal_spacing,
       total_height());
 }
 
 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now);
 
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now)) {
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
 
 bool InfoBarView::DoesIntersectRect(const View* target,
                                     const gfx::Rect& rect) const {
   DCHECK_EQ(this, target);
   // Only events that intersect the portion below the arrow are interesting.
   gfx::Rect non_arrow_bounds = GetLocalBounds();
   non_arrow_bounds.Inset(0, arrow_height(), 0, 0);
   return rect.Intersects(non_arrow_bounds);
 }