The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/6ae90d7232f7d5fc9032e13b4d309a9282c4fd22

commit 6ae90d7232f7d5fc9032e13b4d309a9282c4fd22
Author: lgarron <lgarron@chromium.org>
Date: Mon Oct 10 21:13:57 2016

Switch PopupHeaderView labels to use the GridLayout for automatic sizing.

This allows https://codereview.chromium.org/2306673003 to simply call SizeToContents() on the entire WebsiteSettingsPopupView without having to manually re-layout the header.

BUG= 654153 

Review-Url: https://codereview.chromium.org/2400883002
Cr-Commit-Position: refs/heads/master@{#424241}

[modify] https://crrev.com/6ae90d7232f7d5fc9032e13b4d309a9282c4fd22/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Your change meets the bar and is auto-approved for M55 (branch: 2883)

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0af7d0edfddd038461850cbc8957f1fba1686df9

commit 0af7d0edfddd038461850cbc8957f1fba1686df9
Author: Lucas Garron <lgarron@chromium.org>
Date: Thu Oct 13 00:45:10 2016

Switch PopupHeaderView labels to use the GridLayout for automatic sizing.

This allows https://codereview.chromium.org/2306673003 to simply call SizeToContents() on the entire WebsiteSettingsPopupView without having to manually re-layout the header.

BUG= 654153 

Review-Url: https://codereview.chromium.org/2400883002
Cr-Commit-Position: refs/heads/master@{#424241}
(cherry picked from commit 6ae90d7232f7d5fc9032e13b4d309a9282c4fd22)

Review URL: https://codereview.chromium.org/2412363002 .

Cr-Commit-Position: refs/branch-heads/2883@{#81}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/0af7d0edfddd038461850cbc8957f1fba1686df9/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

lgarron@, could you please provide them to verify the issue from Chrome-TE end.

I don't have a straightforward way to verify the fix.
The CL rewrites some of the layout logic to work better in edge cases, but I don't have a way on hand to trigger these cases in testing.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0af7d0edfddd038461850cbc8957f1fba1686df9

commit 0af7d0edfddd038461850cbc8957f1fba1686df9
Author: Lucas Garron <lgarron@chromium.org>
Date: Thu Oct 13 00:45:10 2016

Switch PopupHeaderView labels to use the GridLayout for automatic sizing.

This allows https://codereview.chromium.org/2306673003 to simply call SizeToContents() on the entire WebsiteSettingsPopupView without having to manually re-layout the header.

BUG= 654153 

Review-Url: https://codereview.chromium.org/2400883002
Cr-Commit-Position: refs/heads/master@{#424241}
(cherry picked from commit 6ae90d7232f7d5fc9032e13b4d309a9282c4fd22)

Review URL: https://codereview.chromium.org/2412363002 .

Cr-Commit-Position: refs/branch-heads/2883@{#81}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}

[modify] https://crrev.com/0af7d0edfddd038461850cbc8957f1fba1686df9/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

[Automated comment] removing mislabelled merge-merged-2840

[Automated comment] removing mislabelled merge-merged-2840