Material Page Info (Views, 3/3): Update site settings section.

chrome/browser/ui/views/website_settings/permission_selector_row.cc

Index: chrome/browser/ui/views/website_settings/permission_selector_row.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_row.cc b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
index 780e1f2c28b2ce3778ce720ab000e8d0dbe14317..0307bb361f3607a81fb6703f0b30f3d169837156 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_row.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
@@ -234,25 +234,15 @@ PermissionSelectorRow::PermissionSelectorRow(
   SetLayoutManager(layout);
   const int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::FIXED,
-                        kPermissionIconColumnWidth,
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
+                        views::GridLayout::FIXED, kPermissionIconColumnWidth,
                         0);
   column_set->AddPaddingColumn(0, kPermissionIconMarginLeft);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
+                        views::GridLayout::USE_PREF, 0, 0);
+  column_set->AddPaddingColumn(1, 16);

[lgarron, 2016/10/07 00:40:08]

Woops, this should be a constant. Fixing.

[lgarron, 2016/10/07 00:54:36]

Done.

+  column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL, 0,
+                        views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(1, column_set_id);
   // Create the permission icon.
@@ -265,9 +255,9 @@ PermissionSelectorRow::PermissionSelectorRow(
                   views::GridLayout::CENTER,
                   views::GridLayout::CENTER);
   // Create the label that displays the permission type.
-  views::Label* label = new views::Label(l10n_util::GetStringFUTF16(
-      IDS_WEBSITE_SETTINGS_PERMISSION_TYPE,
-      WebsiteSettingsUI::PermissionTypeToUIString(permission.type)));
+  // TODO
+  views::Label* label = new views::Label(
+      WebsiteSettingsUI::PermissionTypeToUIString(permission.type));
   layout->AddView(label,
                   1,
                   1,
@@ -368,7 +358,7 @@ void PermissionSelectorRow::PermissionChanged(
     menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
         permission.type, permission.setting, permission.default_setting,
         content_settings::SETTING_SOURCE_USER));
-    menu_button_->SizeToPreferredSize();
+    ChildPreferredSizeChanged(menu_button_);
   } else if (combobox_) {
     bool use_default = permission.setting == CONTENT_SETTING_DEFAULT;
     combobox_->UpdateSelectedIndex(use_default);