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

chrome/browser/ui/views/ime/ime_warning_bubble_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/ui/views/ime/ime_warning_bubble_view.h"
 
 #include <string>
 
 #include "base/callback_helpers.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/feature_switch.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/checkbox.h"
-#include "ui/views/layout/layout_constants.h"
 
 using extensions::Extension;
 
 namespace {
 
 // The column width of the warning bubble.
 const int kColumnWidth = 285;
 
 views::Label* CreateExtensionNameLabel(const base::string16& text) {
   views::Label* label = new views::Label(text, CONTEXT_BODY_TEXT_SMALL);
@@ skipping 132 matching lines @@
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   int cs_id = 0;
 
   views::ColumnSet* main_cs = layout->AddColumnSet(cs_id);
   // The first row which shows the warning info.
   main_cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
                      views::GridLayout::FIXED, kColumnWidth, 0);
 
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+  const int vertical_spacing =
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
   layout->StartRow(0, cs_id);
   base::string16 extension_name = base::UTF8ToUTF16(extension_->name());
   base::i18n::AdjustStringForLocaleDirection(&extension_name);
   views::Label* warning = CreateExtensionNameLabel(l10n_util::GetStringFUTF16(
       IDS_IME_API_ACTIVATED_WARNING, extension_name));
   layout->AddView(warning);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, vertical_spacing);
 
   // The seconde row which shows the check box.
   layout->StartRow(0, cs_id);
   never_show_checkbox_ =
       new views::Checkbox(l10n_util::GetStringUTF16(IDS_IME_API_NEVER_SHOW));
   layout->AddView(never_show_checkbox_);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, vertical_spacing);
 }
 
 bool ImeWarningBubbleView::IsToolbarAnimating() {
   return anchor_to_browser_action_ && container_->animating();
 }