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

chrome/browser/chromeos/ui/request_pin_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/chromeos/ui/request_pin_view.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/options/passphrase_textfield.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.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"
 
 namespace chromeos {
 
 RequestPinView::RequestPinView(const std::string& extension_name,
                                RequestPinView::RequestPinCodeType code_type,
                                int attempts_left,
                                const RequestPinCallback& callback,
                                Delegate* delegate)
@@ skipping 138 matching lines @@
                         views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_view_set_id);
 
   // Infomation label.
   int label_text_id = IDS_REQUEST_PIN_DIALOG_HEADER;
   base::string16 label_text = l10n_util::GetStringUTF16(label_text_id);
   header_label_ = new views::Label(label_text);
   header_label_->SetEnabled(true);
   layout->AddView(header_label_);
 
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  const int related_vertical_spacing =
+      ChromeLayoutProvider::Get()->GetDistanceMetric(
+          views::DISTANCE_RELATED_CONTROL_VERTICAL);
+  layout->AddPaddingRow(0, related_vertical_spacing);
 
   column_view_set_id++;
   column_set = layout->AddColumnSet(column_view_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 100,
                         views::GridLayout::USE_PREF, 0, 0);
 
   // Textfield to enter the PIN/PUK.
   layout->StartRow(0, column_view_set_id);
   textfield_ = new PassphraseTextfield();
   textfield_->set_controller(this);
   textfield_->SetEnabled(true);
   layout->AddView(textfield_);
 
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, related_vertical_spacing);
 
   column_view_set_id++;
   column_set = layout->AddColumnSet(column_view_set_id);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
 
   // Error label.
   layout->StartRow(0, column_view_set_id);
   error_label_ = new views::Label();
   error_label_->SetVisible(false);
@@ skipping 47 matching lines @@
   }
 
   error_label_->SetVisible(true);
   error_label_->SetText(error_message);
   error_label_->SetTooltipText(error_message);
   error_label_->SetEnabledColor(SK_ColorRED);
   error_label_->SizeToPreferredSize();
 }
 
 }  // namespace chromeos