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

chrome/browser/ui/views/collected_cookies_views.cc

 // Copyright (c) 2012 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/collected_cookies_views.h"
 
 #include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
@@ skipping 29 matching lines @@
 #include "ui/gfx/color_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/tree/tree_view.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"
 
 namespace {
 
 // Spacing between the infobar frame and its contents.
 const int kInfobarVerticalPadding = 3;
 const int kInfobarHorizontalPadding = 8;
 
 // Width of the infobar frame.
 const int kInfobarBorderSize = 1;
@@ skipping 81 matching lines @@
   }
 
  private:
   // Initialize contents and layout.
   void Init() {
     AddChildView(content_);
     content_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal,
                              kInfobarHorizontalPadding,
                              kInfobarVerticalPadding,
-                             views::kRelatedControlSmallHorizontalSpacing));
+                             ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL)));
     content_->AddChildView(info_image_);
     content_->AddChildView(label_);
     UpdateVisibility(false, CONTENT_SETTING_BLOCK, base::string16());
   }
 
   // views::View overrides.
   gfx::Size GetPreferredSize() const override {
     // Always return the preferred size, even if not currently visible. This
     // ensures that the layout manager always reserves space within the view
     // so it can be made visible when necessary. Otherwise, changing the
     // visibility of this view would require the entire dialog to be resized,
     // which is undesirable from both a UX and technical perspective.
 
     // Add space around the banner.
     gfx::Size size(content_->GetPreferredSize());
-    size.Enlarge(0, 2 * views::kRelatedControlVerticalSpacing);
+    size.Enlarge(0, 2 * ChromeLayoutProvider::Get()->GetDistanceMetric(
+        views::DISTANCE_RELATED_CONTROL_VERTICAL));
     return size;
   }
 
   void Layout() override {
+    ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+    const int vertical_spacing =
+        provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
     content_->SetBounds(
-        0, views::kRelatedControlVerticalSpacing,
-        width(), height() - views::kRelatedControlVerticalSpacing);
+        0, vertical_spacing, width(), height() - vertical_spacing);
   }
 
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override {
     if (details.is_add && details.child == this)
       Init();
   }
 
   // Holds the info icon image and text label and renders the border.
   views::View* content_;
@@ skipping 360 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, content::NotificationObserver implementation:
 
 void CollectedCookiesViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
   GetWidget()->Close();
 }