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

chrome/browser/ui/views/settings_reset_prompt_dialog.cc

 // Copyright 2017 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/settings_reset_prompt_dialog.h"
 
 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "ui/gfx/font.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/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace safe_browsing {
 
 // static
 void SettingsResetPromptController::ShowSettingsResetPrompt(
     Browser* browser,
     SettingsResetPromptController* controller) {
   SettingsResetPromptDialog* dialog = new SettingsResetPromptDialog(controller);
   // The dialog will delete itself, as implemented in
   // |DialogDelegateView::DeleteDelegate()|, when its widget is closed.
   dialog->Show(browser);
 }
 
 }  // namespace safe_browsing
 
 namespace {
 constexpr int kDialogWidth = 448;
 }  // namespace
 
 SettingsResetPromptDialog::SettingsResetPromptDialog(
     safe_browsing::SettingsResetPromptController* controller)
     : browser_(nullptr), controller_(controller) {
   DCHECK(controller_);
 
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
-                                        views::kButtonHEdgeMarginNew,
-                                        views::kPanelVertMargin, 0));
+  SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kVertical,
+                           provider->GetDistanceMetric(
+                              DISTANCE_DIALOG_BUTTON_MARGIN),

[ananta, 2017/05/18 03:16:29]

Wasn't sure about a simpler FillLayout here.

[Peter Kasting, 2017/05/18 06:10:26]

Yeah, you could probably switch to a FillLayout if you set these insets on the
host (they can't be set on FillLayout itself).

+                           provider->GetDistanceMetric(
+                              DISTANCE_PANEL_CONTENT_MARGIN),
+                           0));
 
   views::StyledLabel* dialog_label =
       new views::StyledLabel(controller_->GetMainText(), /*listener=*/nullptr);
   views::StyledLabel::RangeStyleInfo url_style;
   url_style.weight = gfx::Font::Weight::BOLD;
   dialog_label->AddStyleRange(controller_->GetMainTextUrlRange(), url_style);
   AddChildView(dialog_label);
 }
 
 SettingsResetPromptDialog::~SettingsResetPromptDialog() {
@@ skipping 70 matching lines @@
     controller_ = nullptr;
   }
   return true;
 }
 
 // View overrides.
 
 gfx::Size SettingsResetPromptDialog::GetPreferredSize() const {
   return gfx::Size(kDialogWidth, GetHeightForWidth(kDialogWidth));
 }