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

chrome/browser/ui/views/profiles/forced_reauthentication_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/profiles/forced_reauthentication_dialog.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/i18n/message_formatter.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
-#include "ui/views/layout/layout_provider.h"
 #include "ui/views/view.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace {
 
 // Refresh title of the dialog every second.
 constexpr int kRefreshTitleTimer = 1;
 
 // If browser windows are going to be closed soon, close browser window before
 // showing sign in dialog because there might not be enough time for user to
@@ skipping 27 matching lines @@
   return nullptr;
 }
 
 // PromptLabel overrides the default insets of StyledLabel.
 class PromptLabel : public views::StyledLabel {
  public:
   PromptLabel(const base::string16& text, views::StyledLabelListener* listener)
       : views::StyledLabel(text, listener) {}
 
   gfx::Insets GetInsets() const override {
-    return views::LayoutProvider::Get()->GetInsetsMetric(
+    return ChromeLayoutProvider::Get()->GetInsetsMetric(
         views::INSETS_DIALOG_CONTENTS);
   }
 };
 
 }  // namespace
 
 ForcedReauthenticationDialog::ForcedReauthenticationDialog(
     Browser* browser,
     SigninManager* signin_manager,
     const base::TimeDelta& countdown_duration)
@@ skipping 102 matching lines @@
         IDS_ENTERPRISE_FORCE_SIGNOUT_EXPLANATION_WITHOUT_USER_NAME,
         close_warning);
   } else {
     signin_explanation_text =
         l10n_util::GetStringFUTF16(IDS_ENTERPRISE_FORCE_SIGNOUT_EXPLANATION,
                                    base::ASCIIToUTF16(email), close_warning);
   }
   views::StyledLabel* explanation_label =
       new views::StyledLabel(signin_explanation_text, nullptr);
 
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
   // Layout the components.
-  const gfx::Insets panel_insets =
-      views::LayoutProvider::Get()->GetInsetsMetric(
-          views::INSETS_DIALOG_CONTENTS);
-  SetBorder(views::CreateEmptyBorder(panel_insets.top(), 0,
-                                     panel_insets.bottom(), 0));
+  const gfx::Insets dialog_insets =
+      provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS);
+  SetBorder(views::CreateEmptyBorder(dialog_insets.top(), 0,
+                                     dialog_insets.bottom(), 0));
   views::GridLayout* dialog_layout = new views::GridLayout(this);
   SetLayoutManager(dialog_layout);
 
   // 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_label, 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, views::kPanelVertMargin);
+  dialog_layout->AddPaddingRow(0.0, dialog_insets.top());
   views::ColumnSet* explanation_columns = dialog_layout->AddColumnSet(1);
-  explanation_columns->AddPaddingColumn(0.0, views::kButtonHEdgeMarginNew);
+
+  explanation_columns->AddPaddingColumn(0.0, dialog_insets.left());
   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, dialog_insets.right());
   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));
   refresh_timer_.Start(FROM_HERE,
                        base::TimeDelta::FromSeconds(kRefreshTitleTimer), this,
                        &ForcedReauthenticationDialog::OnCountDown);
 }
 
 void ForcedReauthenticationDialog::OnCountDown() {
   if (desired_close_time_ <= base::TimeTicks::Now()) {
     Cancel();
     GetWidget()->Close();
   }
   GetWidget()->UpdateWindowTitle();
 }
 
 base::TimeDelta ForcedReauthenticationDialog::GetTimeRemaining() const {
   base::TimeTicks now = base::TimeTicks::Now();
   if (desired_close_time_ <= now)
     return base::TimeDelta();
   return desired_close_time_ - now;
 }