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

chrome/browser/ui/views/arc_app_dialog_view.cc

 // Copyright 2016 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/app_list/arc/arc_app_dialog.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 123 matching lines @@
       confirm_callback_(confirm_callback) {
   DCHECK(controller);
   parent_ = controller_->GetAppListWindow();
   if (parent_)
     parent_window_tracker_ = NativeWindowTracker::Create(parent_);
 
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
 
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal,
-      provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN),
       provider->GetDistanceMetric(
-          DISTANCE_PANEL_CONTENT_MARGIN),
+          views::DISTANCE_DIALOG_CONTENTS_HORIZONTAL_MARGIN),
       provider->GetDistanceMetric(
-          views::DISTANCE_RELATED_CONTROL_HORIZONTAL)));
+          views::DISTANCE_DIALOG_CONTENTS_VERTICAL_MARGIN),
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_HORIZONTAL)));
 
   icon_view_ = new FixedBoundarySizeImageView();
   AddChildView(icon_view_);
 
   views::View* text_container = new views::View();
   views::BoxLayout* text_container_layout =
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
   text_container_layout->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
   text_container_layout->set_cross_axis_alignment(
@@ skipping 135 matching lines @@
 
 bool CloseAppDialogViewAndConfirmForTest(bool confirm) {
   if (!g_current_arc_app_dialog_view)
     return false;
 
   g_current_arc_app_dialog_view->ConfirmOrCancelForTest(confirm);
   return true;
 }
 
 }  // namespace arc