Views/Harmony: Remove references to layout constants in c/b/ui/views/sync.

chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

 // Copyright 2013 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/sync/profile_signin_confirmation_dialog_views.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 15 matching lines @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/range/range.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #endif
 
 ProfileSigninConfirmationDialogViews::ProfileSigninConfirmationDialogViews(
     Browser* browser,
     const std::string& username,
@@ skipping 140 matching lines @@
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION :
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION,
           username, learn_more_text, &offsets);
   views::StyledLabel* explanation_label =
       new views::StyledLabel(signin_explanation_text, this);
   explanation_label->AddStyleRange(
       gfx::Range(offsets[1], offsets[1] + learn_more_text.size()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
 
   // Layout the components.
-  const int panel_margin = LayoutDelegate::Get()->GetMetric(
-      LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
+  LayoutDelegate* layout_delegate = LayoutDelegate::Get();
+  const int panel_margin =
+      layout_delegate->GetMetric(LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
+  const int button_margin =
+      layout_delegate->GetMetric(LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN);
   views::GridLayout* dialog_layout = new views::GridLayout(this);
   dialog_layout->SetInsets(panel_margin, 0, 0, 0);
   SetLayoutManager(dialog_layout);
 
   // Use GridLayout inside the prompt bar because StyledLabel requires it.
   views::GridLayout* prompt_layout = views::GridLayout::CreatePanel(prompt_bar);
   prompt_layout->AddColumnSet(0)->AddColumn(
       views::GridLayout::FILL, views::GridLayout::CENTER, 100,
       views::GridLayout::USE_PREF, 0, 0);
   prompt_layout->StartRow(0, 0);
   prompt_layout->AddView(prompt_label);
   // Use a column set with no padding.
   dialog_layout->AddColumnSet(0)->AddColumn(
       views::GridLayout::FILL, views::GridLayout::FILL, 100,
       views::GridLayout::USE_PREF, 0, 0);
   dialog_layout->StartRow(0, 0);
   dialog_layout->AddView(
       prompt_bar, 1, 1,
       views::GridLayout::FILL, views::GridLayout::FILL, 0, 0);
 
   // Use a new column set for the explanation label so we can add padding.
   dialog_layout->AddPaddingRow(0.0, panel_margin);
   views::ColumnSet* explanation_columns = dialog_layout->AddColumnSet(1);
-  explanation_columns->AddPaddingColumn(0.0, views::kButtonHEdgeMarginNew);
+  explanation_columns->AddPaddingColumn(0.0, button_margin);
   explanation_columns->AddColumn(
       views::GridLayout::FILL, views::GridLayout::FILL, 100,
       views::GridLayout::USE_PREF, 0, 0);
-  explanation_columns->AddPaddingColumn(0.0, views::kButtonHEdgeMarginNew);
+  explanation_columns->AddPaddingColumn(0.0, button_margin);

[Patti Lor, 2017/04/06 02:17:19]

Not sure if these two should also be |panel_margin| (same as the |prompt_bar|
above)?

[tapted, 2017/04/06 03:09:56]

|prompt_bar| is the host passed to GridLayout::CreatePanel which was using
kButtonHEdgeMarginNew for horizontal until recently. Now it's
InsetsMetric::PANEL, which gives  LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN
under harmony for horizontal.

So I think this is fine - button_margin is the correct horizontal padding.

But this could be clearer.

I think the nicer approach would be to remove |panel_margin| and
|button_margin|, and do:


const gfx::Insets panel_insets =
ViewsDelegate::GetInstance()->GetInsetsMetric(InsetsMetric::PANEL);

// The prompt bar needs to go to the edge of the dialog, so ignore insets for
the outer layout.
views::GridLayout* dialog_layout = new views::GridLayout(this);
dialog_layout->SetInsets(panel_insets.top(), 0, 0, 0);
SetLayoutManager(dialog_layout);

...

dialog_layout->AddPaddingRow(0.0, panel_insets.bottom());
constexpr int kExplanationColumnSetId = 1;
views::ColumnSet* explanation_columns =
dialog_layout->AddColumnSet(kExplanationColumnSetId);
explanation_columns->AddPaddingColumn(0.0, panel_insets.left());
..
explanation_columns->AddPaddingColumn(0.0, panel_insets.right());
dialog_layout->StartRow(0, kExplanationColumnSetId);

[Patti Lor, 2017/04/06 04:49:58]

Done.

   dialog_layout->StartRow(0, 1);
   const int kPreferredWidth = 440;
   dialog_layout->AddView(explanation_label, 1, 1, views::GridLayout::FILL,
                          views::GridLayout::FILL, kPreferredWidth,
                          explanation_label->GetHeightForWidth(kPreferredWidth));
 }
 
 void ProfileSigninConfirmationDialogViews::WindowClosing() {
   Cancel();
 }
@@ skipping 14 matching lines @@
 void ProfileSigninConfirmationDialogViews::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   DCHECK(prompt_for_new_profile_);
   if (delegate_) {
     delegate_->OnContinueSignin();
     delegate_ = nullptr;
   }
   GetWidget()->Close();
 }