Size the sync row in Personal Stuff pane of Preferences horizontally.

This fixes I18N issues.

BUG=42537
TEST=manual (English and German)

Review URL: http://codereview.chromium.org/1886001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46280 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 0683fe8..dd37f62 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -578,12 +578,13 @@ void PersonalDataManagerObserver::ShowAutoFillDialog(
   RemoveViewFromView(underTheHoodContentView_, enableLoggingCheckbox_);
 #endif  // !defined(GOOGLE_CHROME_BUILD)
 
-  // There are three problem children within the groups:
+  // There are four problem children within the groups:
   //   Basics - Default Browser
+  //   Personal Stuff - Sync
   //   Personal Stuff - Themes
   //   Personal Stuff - Browser Data
-  // These three have buttons that with some localizations are wider then the
-  // view.  So the three get manually laid out before doing the general work so
+  // These four have buttons that with some localizations are wider then the
+  // view.  So the four get manually laid out before doing the general work so
   // the views/window can be made wide enough to fit them.  The layout in the
   // general pass is a noop for these buttons (since they are already sized).
 
@@ -599,6 +600,10 @@ void PersonalDataManagerObserver::ShowAutoFillDialog(
   DCHECK_EQ(defaultBrowserChange.height, 0.0)
       << "Button should have been right height in nib";
 
+  // Size the sync row.
+  CGFloat syncRowChange = SizeToFitButtonPair(syncButton_,
+                                              syncCustomizeButton_);
+
   // Size the themes row.
   const NSUInteger kThemeGroupCount = 3;
   const NSUInteger kThemeResetButtonIndex = 1;
@@ -620,7 +625,8 @@ void PersonalDataManagerObserver::ShowAutoFillDialog(
      NSWidth([underTheHoodContentView_ frame]));
 
   // Find the most any row changed in size.
-  CGFloat maxWidthChange = std::max(defaultBrowserChange.width, themeRowChange);
+  CGFloat maxWidthChange = std::max(defaultBrowserChange.width, syncRowChange);
+  maxWidthChange = std::max(maxWidthChange, themeRowChange);
   maxWidthChange = std::max(maxWidthChange, privacyRowChange);
 
   // If any grew wider, make the views wider. If they all shrank, they fit the