Description: Replace layout constants in chrome/browser/extensions and chrome/browser/first_run

chrome/browser/extensions/api/file_system/request_file_system_dialog_view.cc

 // Copyright 2015 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/extensions/api/file_system/request_file_system_dialog_view.h"
 
 #include <stddef.h>
 
 #include <cstdlib>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.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 "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/range/range.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 // Maximum width of the dialog in pixels.
 const int kDialogMaxWidth = 320;
 
 }  // namespace
 
 // static
 void RequestFileSystemDialogView::ShowDialog(
@@ skipping 93 matching lines @@
 
   DCHECK_EQ(2u, placeholder_offsets.size());
   label->AddStyleRange(gfx::Range(placeholder_offsets[0],
                                   placeholder_offsets[0] + app_name.length()),
                        bold_style);
   label->AddStyleRange(
       gfx::Range(placeholder_offsets[1],
                  placeholder_offsets[1] + volume_name.length()),
       bold_style);
 
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+  const int button_margin =
+      provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
+  const int vertical_margin =
+      provider->GetDistanceMetric(DISTANCE_PANEL_CONTENT_MARGIN);

[Peter Kasting, 2017/04/17 19:36:18]

This combination is basically INSETS_PANEL.

We could ask for a GridLayout with these insets using GridLayout::CreatePanel().
 But this is overkill, since there's only one child.  It seems like we don't
even need a BoxLayout, as we could just set |contents_view_|'s insets to
INSETS_PANEL and then use a FillLayout.  This would require that
|contents_view_| returns the correct preferred size.

The easiest way to accomplish that seems like it would be to change this class
to subclass DialogDelegateView instead of DialogDelegate, and nuke
|contents_view_| entirely.  Then we could override GetPreferredSize() to return
a width of 320 and a height calculated using GetHeightForWidth() on the label. 
You'd have to double-check that this sizes the label properly.

The overall result of those changes ought to be a noticeably simpler class.

[ananta, 2017/04/26 02:37:29]

Changed to use FillLayout. To return the insets I added an override for
GetInsets() in the dialog and returned panel insets. I am not sure if this is
the right way to do it.

+
   views::BoxLayout* const layout = new views::BoxLayout(
-      views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew,
-      views::kPanelVertMargin, 0);
+      views::BoxLayout::kHorizontal, button_margin, vertical_margin, 0);
   contents_view_->SetLayoutManager(layout);
 
-  label->SizeToFit(kDialogMaxWidth - 2 * views::kButtonHEdgeMarginNew);
+  label->SizeToFit(kDialogMaxWidth - 2 * button_margin);
   contents_view_->AddChildView(label);
 }