Delete panel metrics and define insets in terms of distance metrics.

ui/views/window/dialog_client_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 "ui/views/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 59 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ButtonRowContainer);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, public:
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view),
       button_row_insets_(
-          LayoutProvider::Get()->GetInsetsMetric(INSETS_DIALOG_BUTTON)) {
+          LayoutProvider::Get()->GetInsetsMetric(INSETS_DIALOG_BUTTON_ROW)) {
   // Doing this now ensures this accelerator will have lower priority than
   // one set by the contents view.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   button_row_container_ = new ButtonRowContainer(this);
   AddChildView(button_row_container_);
 }
 
 DialogClientView::~DialogClientView() {}
 
 void DialogClientView::AcceptWindow() {
@@ skipping 243 matching lines @@
   if (extra_view_ && !views[0])
     AddChildView(extra_view_);
 
   if (std::count(views.begin(), views.end(), nullptr) == kNumButtons)
     return;
 
   gfx::Insets insets = button_row_insets_;
   LayoutProvider* const layout_provider = LayoutProvider::Get();
   // Support dialogs that clear |button_row_insets_| to do their own layout.
   // They expect GetDialogRelatedControlVerticalSpacing() in this case.
   // TODO(tapted): Remove this under Harmony.

[Peter Kasting, 2017/05/18 00:00:07]

Nit: Remove TODO?

[Bret, 2017/05/18 00:50:06]

Done.

-  if (insets.top() == 0) {
+  if (insets.top() == 0 &&
+      !ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     const int top =
         layout_provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_VERTICAL);
     insets.Set(top, insets.left(), insets.bottom(), insets.right());
   }
 
   // The |resize_percent| constants. There's only one stretchy column (padding
   // to the left of ok/cancel buttons).
   constexpr float kFixed = 0.f;
   constexpr float kStretchy = 1.f;
 
@@ skipping 65 matching lines @@
 
   if (extra_view_)
     return;
 
   extra_view_ = GetDialogDelegate()->CreateExtraView();
   if (extra_view_)
     extra_view_->SetGroup(kButtonGroup);
 }
 
 }  // namespace views