Implement Harmony-style consistent button widths for Collected Cookies.

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 50 matching lines @@
 const int kInfobarBorderSize = 1;
 
 // Dimensions of the tree views.
 const int kTreeViewWidth = 400;
 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) {
+  using views::GridLayout;

[Peter Kasting, 2017/03/07 02:50:37]

Nit: I don't think this saves a single line in this function, and it only
removes verbosity in two statements below.  I'd just omit it.

[tapted, 2017/03/07 12:06:41]

Done.

+  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_SHARED_WIDTH);
+
+  views::ColumnSet* column_set = layout->AddColumnSet(column_layout_id);
+  column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
+                        GridLayout::USE_PREF, 0, 0);
+  column_set->AddPaddingColumn(0, button_padding);
+  column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
+                        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);
+}
+
 }  // namespace
 
 // A custom view that conditionally displays an infobar.
 class InfobarView : public views::View {
  public:
   InfobarView() {
     content_ = new views::View;
     SkColor border_color = SK_ColorGRAY;
     content_->SetBorder(
         views::CreateSolidBorder(kInfobarBorderSize, border_color));
@@ skipping 287 matching lines @@
   using views::GridLayout;
 
   views::View* pane = new views::View();
   GridLayout* layout = layout_utils::CreatePanelLayout(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);
 
-  const int three_columns_layout_id = 1;
-  column_set = layout->AddColumnSet(three_columns_layout_id);
-  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
-                        GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(
-      0,
-      LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::RELATED_BUTTON_HORIZONTAL_SPACING));
-  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
-                        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->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->StartRow(0, three_columns_layout_id);
+  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 =
       TabSpecificContentSettings::FromWebContents(web_contents_);
 
@@ skipping 30 matching lines @@
   using views::GridLayout;
 
   views::View* pane = new views::View();
   GridLayout* layout = layout_utils::CreatePanelLayout(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);
 
-  const int three_columns_layout_id = 1;
-  column_set = layout->AddColumnSet(three_columns_layout_id);
-  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
-                        GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(
-      0,
-      LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::RELATED_BUTTON_HORIZONTAL_SPACING));
-  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
-                        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->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->StartRow(0, three_columns_layout_id);
+  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 =
       views::ScrollView::CreateScrollViewWithBorder();
   scroll_view->SetContents(pane);
@@ skipping 66 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();
 }