Broke out layout metric information from ViewsDelegate to LayoutProvider

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"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/views/cookie_info_view.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 29 matching lines @@
 const int kTreeViewHeight = 125;
 
 // Spacing constants used with non-Harmony dialogs.
 const int kTabbedPaneTopPadding = 14;
 const int kCookieInfoBottomPadding = 4;
 
 // Adds a ColumnSet to |layout| to hold two buttons with padding between.
 // Starts a new row with the added ColumnSet.
 void StartNewButtonColumnSet(views::GridLayout* layout,
                              const int column_layout_id) {
-  LayoutDelegate* layout_delegate = LayoutDelegate::Get();
-  const int button_padding = layout_delegate->GetMetric(
-      LayoutDelegate::Metric::RELATED_BUTTON_HORIZONTAL_SPACING);
-  const int button_size_limit = layout_delegate->GetMetric(
-      LayoutDelegate::Metric::BUTTON_MAX_LINKABLE_WIDTH);
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+  const int button_padding =
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
+  const int button_size_limit =
+      provider->GetDistanceMetric(DISTANCE_BUTTON_MAX_LINKABLE_WIDTH);
 
   views::ColumnSet* column_set = layout->AddColumnSet(column_layout_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, button_padding);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->LinkColumnSizes(0, 2, -1);
   column_set->set_linked_column_size_limit(button_size_limit);
   layout->StartRow(0, column_layout_id);
@@ skipping 195 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, views::View overrides:
 
 gfx::Size CollectedCookiesViews::GetMinimumSize() const {
   // Allow UpdateWebContentsModalDialogPosition to clamp the dialog width.
   return gfx::Size(0, View::GetMinimumSize().height());
 }
 
 gfx::Size CollectedCookiesViews::GetPreferredSize() const {
-  int preferred = LayoutDelegate::Get()->GetDialogPreferredWidth(
-      LayoutDelegate::DialogWidth::MEDIUM);
+  int preferred =
+      ChromeLayoutProvider::Get()->GetDialogPreferredWidth(DialogWidth::MEDIUM);
   return gfx::Size(preferred ? preferred : View::GetPreferredSize().width(),
                    View::GetPreferredSize().height());
 }
 
 void CollectedCookiesViews::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   views::DialogDelegateView::ViewHierarchyChanged(details);
   if (details.is_add && details.child == this)
     Init();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, private:
 
 CollectedCookiesViews::~CollectedCookiesViews() {
   allowed_cookies_tree_->SetModel(NULL);
   blocked_cookies_tree_->SetModel(NULL);
 }
 
 void CollectedCookiesViews::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new GridLayout(this);
-  if (LayoutDelegate::Get()->UseExtraDialogPadding())
+  if (ChromeLayoutProvider::Get()->UseExtraDialogPadding())

[Peter Kasting, 2017/04/12 21:37:43]

Nit: Pull layout provider out to a temp for reuse?

[kylix_rd, 2017/04/13 16:45:42]

Done.

     layout->SetInsets(gfx::Insets(kTabbedPaneTopPadding, 0, 0, 0));
   SetLayoutManager(layout);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   views::TabbedPane* tabbed_pane = new views::TabbedPane();
 
   layout->AddView(tabbed_pane);
   // NOTE: Panes must be added after |tabbed_pane| has been added to its parent.
   base::string16 label_allowed = l10n_util::GetStringUTF16(
       IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL);
   base::string16 label_blocked = l10n_util::GetStringUTF16(
       IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL);
   tabbed_pane->AddTab(label_allowed, CreateAllowedPane());
   tabbed_pane->AddTab(label_blocked, CreateBlockedPane());
   tabbed_pane->SelectTabAt(0);
   tabbed_pane->set_listener(this);
-  if (LayoutDelegate::Get()->UseExtraDialogPadding()) {
-    layout->AddPaddingRow(
-        0,
-        LayoutDelegate::Get()->GetMetric(
-            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  if (ChromeLayoutProvider::Get()->UseExtraDialogPadding()) {
+    layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   layout->StartRow(0, single_column_layout_id);
   cookie_info_view_ = new CookieInfoView();
   layout->AddView(cookie_info_view_);
-  if (LayoutDelegate::Get()->UseExtraDialogPadding())
+  if (ChromeLayoutProvider::Get()->UseExtraDialogPadding())
     layout->AddPaddingRow(0, kCookieInfoBottomPadding);
 
   layout->StartRow(0, single_column_layout_id);
   infobar_ = new InfobarView();
   layout->AddView(infobar_);
 
   EnableControls();
   ShowCookieInfo();
 }
 
@@ skipping 28 matching lines @@
   views::View* pane = new views::View();
   GridLayout* layout = GridLayout::CreatePanel(pane);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(allowed_label_);
-  layout->AddPaddingRow(
-      0,
-      LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                               DISTANCE_UNRELATED_CONTROL_VERTICAL));

[Peter Kasting, 2017/04/12 21:37:43]

Nit: Pull vertical distance out to a temp for reuse?

[kylix_rd, 2017/04/13 16:45:42]

Done.

 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(CreateScrollView(allowed_cookies_tree_), 1, 1,
                   GridLayout::FILL, GridLayout::FILL, kTreeViewWidth,
                   kTreeViewHeight);
-  layout->AddPaddingRow(
-      0, LayoutDelegate::Get()->GetMetric(
-             LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                               DISTANCE_UNRELATED_CONTROL_VERTICAL));
 
   StartNewButtonColumnSet(layout, single_column_layout_id + 1);
   layout->AddView(block_allowed_button_);
   layout->AddView(delete_allowed_button_);
 
   return pane;
 }
 
 views::View* CollectedCookiesViews::CreateBlockedPane() {
   TabSpecificContentSettings* content_settings =
@@ skipping 34 matching lines @@
   views::View* pane = new views::View();
   GridLayout* layout = GridLayout::CreatePanel(pane);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(blocked_label_, 1, 1, GridLayout::FILL, GridLayout::FILL);
-  layout->AddPaddingRow(
-      0,
-      LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                               DISTANCE_UNRELATED_CONTROL_VERTICAL));

[Peter Kasting, 2017/04/12 21:37:43]

Nit: Pull vertical distance out to a temp for reuse?

[kylix_rd, 2017/04/13 16:45:42]

Done.

 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       CreateScrollView(blocked_cookies_tree_), 1, 1,
       GridLayout::FILL, GridLayout::FILL, kTreeViewWidth, kTreeViewHeight);
-  layout->AddPaddingRow(
-      0, LayoutDelegate::Get()->GetMetric(
-             LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(
+                               DISTANCE_UNRELATED_CONTROL_VERTICAL));
 
   StartNewButtonColumnSet(layout, single_column_layout_id + 1);
   layout->AddView(allow_blocked_button_);
   layout->AddView(for_session_blocked_button_);
 
   return pane;
 }
 
 views::View* CollectedCookiesViews::CreateScrollView(views::TreeView* pane) {
   views::ScrollView* scroll_view =
@@ skipping 68 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();
 }