Views/Harmony: Use LayoutDelegate::GetMetric() for views::kPanelHorizMargin.

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));
-  SetBorder(views::CreateEmptyBorder(0, views::kPanelHorizMargin,
-                                     trailing_vertical_space,
-                                     views::kPanelHorizMargin));
+  const int kBorderHorizMargin = LayoutDelegate::Get()->GetMetric(

[tapted, 2017/02/20 04:42:00]

nit: const int border_horiz_margin = ..

(we only use kFooStyle for compile-time constants - e.g. when `constexpr int
kFoo..` would work)

[Patti Lor, 2017/02/20 06:34:39]

Done, thanks!

+      LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
+  SetBorder(views::CreateEmptyBorder(
+      0, kBorderHorizMargin, trailing_vertical_space, kBorderHorizMargin));
   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);
@@ skipping 35 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());
   }
 }