Description: Views/Harmony Remove references to ui/views/layout/layout_constants.h

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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/native_window_tracker.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace arc {
 
 namespace {
 
 const int kRightColumnWidth = 210;
 const int kIconSize = 64;
@@ skipping 94 matching lines @@
       app_id_(app_id),
       window_title_(window_title),
       confirm_button_text_(confirm_button_text),
       cancel_button_text_(cancel_button_text),
       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, views::kButtonHEdgeMarginNew,
-      ChromeLayoutProvider::Get()->GetDistanceMetric(
+      views::BoxLayout::kHorizontal,
+      provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN),
+      provider->GetDistanceMetric(
           DISTANCE_PANEL_CONTENT_MARGIN),

[ananta, 2017/05/09 02:35:42]

Wondering if we should simplify this to a CreatePanel with panel insets?

[Peter Kasting, 2017/05/10 22:47:42]

Right now CreatePanel() is only defined on GridLayout.  We probably don't want
to switch to GridLayout here.

You could do a separate CL that defines a similar function on BoxLayout and
switches everywhere applicable in the codebase to use it.  That would make sense
if there are multiple places wanting to do this, which I think there are.

You may end up wanting a BoxLayout constructor that takes insets rather than
just horizontal/vertical values while you're at it.

-      views::kRelatedControlHorizontalSpacing));
+      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