Views/Harmony: Replace layout constants in chrome/browser/ui/views/extensions.

chrome/browser/ui/views/extensions/media_gallery_checkbox_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/extensions/media_gallery_checkbox_view.h"
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/border.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 // Equal to the #9F9F9F color used in spec (note WebUI color is #999).
 const SkColor kDeemphasizedTextColor = SkColorSetRGB(159, 159, 159);
 
 }  // namespace
 
 MediaGalleryCheckboxView::MediaGalleryCheckboxView(
     const MediaGalleryPrefInfo& pref_info,
     int trailing_vertical_space,
     views::ButtonListener* button_listener,
     views::ContextMenuController* menu_controller) {
   DCHECK(button_listener != NULL);
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
-  const int border_horiz_margin = LayoutDelegate::Get()->GetMetric(
-      LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
+  LayoutDelegate* layout_delegate = LayoutDelegate::Get();
+  const int border_horiz_margin =
+      layout_delegate->GetMetric(LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
   SetBorder(views::CreateEmptyBorder(
       0, border_horiz_margin, trailing_vertical_space, border_horiz_margin));
   if (menu_controller)
     set_context_menu_controller(menu_controller);
 
   checkbox_ = new views::Checkbox(pref_info.GetGalleryDisplayName());
   checkbox_->set_listener(button_listener);
   if (menu_controller)
     checkbox_->set_context_menu_controller(menu_controller);
   checkbox_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   base::string16 tooltip_text = pref_info.GetGalleryTooltip();
   checkbox_->SetTooltipText(tooltip_text);
 
   base::string16 details = pref_info.GetGalleryAdditionalDetails();
   secondary_text_ = new views::Label(details);
   if (menu_controller)
     secondary_text_->set_context_menu_controller(menu_controller);
   secondary_text_->SetVisible(details.length() > 0);
   secondary_text_->SetEnabledColor(kDeemphasizedTextColor);
   secondary_text_->SetElideBehavior(gfx::ELIDE_HEAD);
   secondary_text_->SetTooltipText(tooltip_text);
   secondary_text_->SetBorder(views::CreateEmptyBorder(
-      0, views::kRelatedControlSmallHorizontalSpacing, 0, 0));
+      0,
+      layout_delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING),

[Peter Kasting, 2017/03/23 04:21:34]

Same comment.

[Patti Lor, 2017/03/24 06:37:12]

Fixed to previous value.

+      0, 0));
 
   AddChildView(checkbox_);
   AddChildView(secondary_text_);
 }
 
 MediaGalleryCheckboxView::~MediaGalleryCheckboxView() {}
 
 void MediaGalleryCheckboxView::Layout() {
   views::View::Layout();
   if (GetPreferredSize().width() <= GetLocalBounds().width())
@@ skipping 14 matching lines @@
         std::max(area.width() / 2, area.width() - checkbox_width);
   }
   checkbox_width = area.width() - secondary_text_width;
 
   checkbox_->SetBounds(area.x(), area.y(), checkbox_width, area.height());
   if (secondary_text_->visible()) {
     secondary_text_->SetBounds(checkbox_->x() + checkbox_width, area.y(),
                                secondary_text_width, area.height());
   }
 }