Fix prefs dialog to size properly under RI.

BUG=19476
TEST=prefs dialog is usable under RI (scrolling Under the Hood is wonky; don't think we can fix that)

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

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

1 files changed, 8 insertions, 3 deletions

diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index fcc3fd7..624757f 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -739,12 +739,15 @@ void PersonalDataManagerObserver::ShowAutoFillDialog(
 
   // Make the window as wide as the views.
   NSWindow* prefsWindow = [self window];
-  NSRect frame = [prefsWindow frame];
+  NSView* prefsContentView = [prefsWindow contentView];
+  NSRect frame = [prefsContentView convertRect:[prefsWindow frame]
+                                      fromView:nil];
   frame.size.width = newWidth;
+  frame = [prefsContentView convertRect:frame toView:nil];
   [prefsWindow setFrame:frame display:NO];
 
   // The Under the Hood prefs is a scroller, it shouldn't get any border, so it
-  // gets resized to the as wide as the window ended up.
+  // gets resized to be as wide as the window ended up.
   NSSize underTheHoodSize = [underTheHoodView_ frame].size;
   underTheHoodSize.width = newWidth;
   [underTheHoodView_ setFrameSize:underTheHoodSize];
@@ -1795,13 +1798,15 @@ const int kDisabledIndex = 1;
   [prefsWindow setTitle:[toolbarItem label]];
 
   // Figure out the size of the window.
-  NSRect windowFrame = [prefsWindow frame];
+  NSRect windowFrame = [contentView convertRect:[prefsWindow frame]
+                                       fromView:nil];
   CGFloat titleToolbarHeight =
       NSHeight(windowFrame) - NSHeight(contentViewFrame);
   windowFrame.size.height =
       NSHeight(prefsViewFrame) + titleToolbarHeight;
   DCHECK_GE(NSWidth(windowFrame), NSWidth(prefsViewFrame))
       << "Initial width set wasn't wide enough.";
+  windowFrame = [contentView convertRect:windowFrame toView:nil];
   windowFrame.origin.y = NSMaxY([prefsWindow frame]) - NSHeight(windowFrame);
 
   // Now change the size.