Merge 169678

chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h"
 
 #include <cmath>
 
 #import <AppKit/AppKit.h>
 
@@ skipping 19 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
-// The width of the window, in view coordinates. The height will be determined
-// by the content.
-const CGFloat kWindowWidth = 310;
+// The default width of the window, in view coordinates. It may be larger to
+// fit the content.
+const CGFloat kDefaultWindowWidth = 310;
 
 // Spacing in between sections.
 const CGFloat kVerticalSpacing = 10;
 
 // Padding between the window frame and content.
 const CGFloat kFramePadding = 20;
 
 // Padding between the window frame and content for the internal page bubble.
 const CGFloat kInternalPageFramePadding = 10;
 
@@ skipping 24 matching lines @@
 
 // The spacing between individual items in the Permissions tab.
 const CGFloat kPermissionsTabSpacing = 12;
 
 // Extra spacing after a headline on the Permissions tab.
 const CGFloat kPermissionsHeadlineSpacing = 2;
 
 // The amount of horizontal space between a permission label and the popup.
 const CGFloat kPermissionPopUpXSpacing = 3;
 
+// The amount of horizontal space between the permission popup title and the
+// arrow icon.
+const CGFloat kPermissionButtonTitleRightPadding = 4;
+
 // The extra space to the left of the first tab in the tab strip.
 const CGFloat kTabStripXPadding = kFramePadding;
 
 // The amount of space between the visual borders of adjacent tabs.
 const CGFloat kTabSpacing = 4;
 
 // The amount of space above the tab strip.
 const CGFloat kTabStripTopSpacing = 14;
 
 // The height of the clickable area of the tab.
@@ skipping 96 matching lines @@
                        nil,
                        tabstripCenterImage_,
                        tabstripLeftImage_,
                        /*vertical=*/ NO,
                        NSCompositeSourceOver,
                        1,
                        /*flipped=*/ YES);
 
   // Draw the background to the right of the selected tab.
   backgroundRect.origin.x = NSMaxX(tabRect);
-  backgroundRect.size.width = kWindowWidth - NSMaxX(tabRect);
+  backgroundRect.size.width = NSMaxX(cellFrame) - NSMaxX(tabRect);
   NSDrawThreePartImage(backgroundRect,
                        tabstripRightImage_,
                        tabstripCenterImage_,
                        nil,
                        /*vertical=*/ NO,
                        NSCompositeSourceOver,
                        1,
                        /*flipped=*/ YES);
 
   // Call the superclass method to trigger drawing of the tab labels.
@@ skipping 64 matching lines @@
 // Returns the minimum size required to display this cell.
 // It should always be exactly as tall as the tabstrip background image.
 - (NSSize)cellSize {
   return NSMakeSize([super cellSize].width,
                     [tabstripCenterImage_ size].height);
 }
 @end
 
 @implementation WebsiteSettingsBubbleController
 
+- (CGFloat)defaultWindowWidth {
+  return kDefaultWindowWidth;
+}
+
 - (id)initWithParentWindow:(NSWindow*)parentWindow
    websiteSettingsUIBridge:(WebsiteSettingsUIBridge*)bridge
                tabContents:(TabContents*)tabContents
             isInternalPage:(BOOL)isInternalPage {
   DCHECK(parentWindow);
 
   tabContents_ = tabContents;
 
   // Use an arbitrary height; it will be changed in performLayout.
-  NSRect contentRect = NSMakeRect(0, 0, kWindowWidth, 1);
+  NSRect contentRect = NSMakeRect(0, 0, [self defaultWindowWidth], 1);
   // Create an empty window into which content is placed.
   scoped_nsobject<InfoBubbleWindow> window(
       [[InfoBubbleWindow alloc] initWithContentRect:contentRect
                                           styleMask:NSBorderlessWindowMask
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
 
   if ((self = [super initWithWindow:window.get()
                        parentWindow:parentWindow
                          anchoredAt:NSZeroPoint])) {
     [[self bubble] setArrowLocation:info_bubble::kTopLeft];
 
     // Create the container view that uses flipped coordinates.
-    NSRect contentFrame = NSMakeRect(0, 0, kWindowWidth, 300);
+    NSRect contentFrame = NSMakeRect(0, 0, [self defaultWindowWidth], 300);
     contentView_.reset(
         [[FlippedView alloc] initWithFrame:contentFrame]);
 
     // Replace the window's content.
     [[[self window] contentView] setSubviews:
         [NSArray arrayWithObject:contentView_.get()]];
 
     if (isInternalPage)
       [self initializeContentsForInternalPage];
     else
@@ skipping 37 matching lines @@
                                   toView:contentView_
                                  atPoint:controlOrigin];
   // Center the text vertically with the image.
   NSRect textFrame = [textField frame];
   textFrame.origin.y += (imageSize.height - NSHeight(textFrame)) / 2;
   [textField setFrame:textFrame];
 
   // Adjust the contentView to fit everything.
   CGFloat maxY = std::max(NSMaxY([imageView frame]), NSMaxY(textFrame));
   [contentView_ setFrame:NSMakeRect(
-      0, 0, kWindowWidth, maxY + kInternalPageFramePadding)];
+      0, 0, [self defaultWindowWidth], maxY + kInternalPageFramePadding)];
 
   [self sizeAndPositionWindow];
 }
 
 // Create the subviews for the website settings bubble.
 - (void)initializeContents {
   // Keeps track of the position that the next control should be drawn at.
   NSPoint controlOrigin = NSMakePoint(
       kFramePadding,
       kFramePadding + info_bubble::kBubbleArrowHeight);
@@ skipping 12 matching lines @@
                               withSize:[NSFont smallSystemFontSize]
                                   bold:NO
                                 toView:contentView_
                                atPoint:controlOrigin];
 
   // Create the tab view and its two tabs.
 
   scoped_nsobject<WebsiteSettingsTabSegmentedCell> cell(
       [[WebsiteSettingsTabSegmentedCell alloc] init]);
   CGFloat tabstripHeight = [cell cellSize].height;
-  NSRect tabstripFrame = NSMakeRect(0, 0, kWindowWidth, tabstripHeight);
+  NSRect tabstripFrame = NSMakeRect(
+      0, 0, [self defaultWindowWidth], tabstripHeight);
   segmentedControl_.reset(
       [[NSSegmentedControl alloc] initWithFrame:tabstripFrame]);
   [segmentedControl_ setCell:cell];
   [segmentedControl_ setSegmentCount:WebsiteSettingsUI::NUM_TAB_IDS];
   [segmentedControl_ setTarget:self];
   [segmentedControl_ setAction:@selector(tabSelected:)];
+  [segmentedControl_ setAutoresizingMask:NSViewWidthSizable];
 
   NSFont* smallSystemFont =
       [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
   NSDictionary* textAttributes =
       [NSDictionary dictionaryWithObject:smallSystemFont
                                   forKey:NSFontAttributeName];
 
   // Create the "Permissions" tab.
   NSString* label = l10n_util::GetNSString(
       IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS);
@@ skipping 18 matching lines @@
   tabWidth = std::max(tabWidth,
                       textSize.width + 2 * kTabLabelXPadding);
   [segmentedControl_ setWidth:tabWidth + kTabStripXPadding
                    forSegment:WebsiteSettingsUI::TAB_ID_PERMISSIONS];
   [segmentedControl_ setWidth:tabWidth
                    forSegment:WebsiteSettingsUI::TAB_ID_CONNECTION];
 
   [segmentedControl_ setFont:smallSystemFont];
   [contentView_ addSubview:segmentedControl_];
 
-  NSRect tabFrame = NSMakeRect(0, 0, kWindowWidth, 300);
+  NSRect tabFrame = NSMakeRect(0, 0, [self defaultWindowWidth], 300);
   tabView_.reset([[NSTabView alloc] initWithFrame:tabFrame]);
   [tabView_ setTabViewType:NSNoTabsNoBorder];
   [tabView_ setDrawsBackground:NO];
   [tabView_ setControlSize:NSSmallControlSize];
   [contentView_ addSubview:tabView_.get()];
 
   permissionsTabContentView_ = [self addPermissionsTabToTabView:tabView_];
   connectionTabContentView_ = [self addConnectionTabToTabView:tabView_];
   [self setSelectedTab:WebsiteSettingsUI::TAB_ID_PERMISSIONS];
 
   [self performLayout];
 }
 
 // Create the contents of the Permissions tab and add it to the given tab view.
 // Returns a weak reference to the tab view item's view.
 - (NSView*)addPermissionsTabToTabView:(NSTabView*)tabView {
   scoped_nsobject<NSTabViewItem> item([[NSTabViewItem alloc] init]);
   [tabView_ insertTabViewItem:item.get()
                       atIndex:WebsiteSettingsUI::TAB_ID_PERMISSIONS];
   scoped_nsobject<NSView> contentView([[FlippedView alloc]
       initWithFrame:[tabView_ contentRect]]);
+  [contentView setAutoresizingMask:NSViewWidthSizable];
   [item setView:contentView.get()];
 
   // Initialize the two containers that hold the controls. The initial frames
   // are arbitrary, and will be adjusted after the controls are laid out.
   cookiesView_ = [[[FlippedView alloc]
       initWithFrame:[tabView_ contentRect]] autorelease];
+  [cookiesView_ setAutoresizingMask:NSViewWidthSizable];
+
   permissionsView_ = [[[FlippedView alloc]
       initWithFrame:[tabView_ contentRect]] autorelease];
 
   [contentView addSubview:cookiesView_];
   [contentView addSubview:permissionsView_];
 
   // Create the link button to view cookies and site data.
   // Its position will be set in performLayout.
   NSString* cookieButtonText = l10n_util::GetNSString(
       IDS_WEBSITE_SETTINGS_SHOW_SITE_DATA);
@@ skipping 30 matching lines @@
       content::PAGE_TRANSITION_LINK,
       false));
 }
 
 // Create the contents of the Connection tab and add it to the given tab view.
 // Returns a weak reference to the tab view item's view.
 - (NSView*)addConnectionTabToTabView:(NSTabView*)tabView {
   scoped_nsobject<NSTabViewItem> item([[NSTabViewItem alloc] init]);
   scoped_nsobject<NSView> contentView([[FlippedView alloc]
       initWithFrame:[tabView_ contentRect]]);
+  [contentView setAutoresizingMask:NSViewWidthSizable];
 
   // Place all the text and images at the same position. The positions will be
   // adjusted in performLayout.
   NSPoint textPosition = NSMakePoint(
       kFramePadding + kConnectionImageSize + kConnectionImageSpacing,
       kFramePadding);
   NSPoint imagePosition = NSMakePoint(kFramePadding, kFramePadding);
   NSSize imageSize = NSMakeSize(kConnectionImageSize, kConnectionImageSize);
 
   identityStatusIcon_ = [self addImageWithSize:imageSize
                                         toView:contentView
                                        atPoint:imagePosition];
   identityStatusDescriptionField_ =
       [self addText:string16()
            withSize:[NSFont smallSystemFontSize]
                bold:NO
              toView:contentView.get()
             atPoint:textPosition];
+
   separatorAfterIdentity_ = [self addSeparatorToView:contentView];
+  [separatorAfterIdentity_ setAutoresizingMask:NSViewWidthSizable];
 
   connectionStatusIcon_ = [self addImageWithSize:imageSize
                                           toView:contentView
                                          atPoint:imagePosition];
   connectionStatusDescriptionField_ =
       [self addText:string16()
            withSize:[NSFont smallSystemFontSize]
                bold:NO
              toView:contentView.get()
             atPoint:textPosition];
   certificateInfoButton_ = nil;  // This will be created only if necessary.
   separatorAfterConnection_ = [self addSeparatorToView:contentView];
+  [separatorAfterConnection_ setAutoresizingMask:NSViewWidthSizable];
 
   firstVisitIcon_ = [self addImageWithSize:imageSize
                                     toView:contentView
                                    atPoint:imagePosition];
   firstVisitHeaderField_ =
       [self addText:l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE)
            withSize:[NSFont smallSystemFontSize]
                bold:YES
              toView:contentView.get()
             atPoint:textPosition];
   firstVisitDescriptionField_ =
       [self addText:string16()
            withSize:[NSFont smallSystemFontSize]
                bold:NO
              toView:contentView.get()
             atPoint:textPosition];
 
   separatorAfterFirstVisit_ = [self addSeparatorToView:contentView];
+  [separatorAfterFirstVisit_ setAutoresizingMask:NSViewWidthSizable];
+
   NSString* helpButtonText = l10n_util::GetNSString(
       IDS_PAGE_INFO_HELP_CENTER_LINK);
   helpButton_ = [self addLinkButtonWithText:helpButtonText
                                      toView:contentView];
   [helpButton_ setTarget:self];
   [helpButton_ setAction:@selector(showHelpPage:)];
 
   [item setView:contentView.get()];
   [tabView_ insertTabViewItem:item.get()
                       atIndex:WebsiteSettingsUI::TAB_ID_CONNECTION];
 
   return contentView.get();
 }
 
 // Set the Y position of |view| to the given position, and return the position
 // of its bottom edge.
 - (CGFloat)setYPositionOfView:(NSView*)view to:(CGFloat)position {
   NSRect frame = [view frame];
   frame.origin.y = position;
   [view setFrame:frame];
   return position + NSHeight(frame);
 }
 
+- (void)setWidthOfView:(NSView*)view to:(CGFloat)width {
+  [view setFrameSize:NSMakeSize(width, NSHeight([view frame]))];
+}
+
 // Layout all of the controls in the window. This should be called whenever
 // the content has changed.
 - (void)performLayout {
+  // Make the content at least as wide as the permissions view.
+  CGFloat contentWidth = std::max([self defaultWindowWidth],
+                                  NSWidth([permissionsView_ frame]));
+
+  // Set the width of the content view now, so that all the text fields will
+  // be sized to fit before their heights and vertical positions are adjusted.
+  // The tab view will only resize the currently selected tab, so resize both
+  // tab content views manually.
+  [self setWidthOfView:contentView_ to:contentWidth];
+  [self setWidthOfView:permissionsTabContentView_ to:contentWidth];
+  [self setWidthOfView:connectionTabContentView_ to:contentWidth];
+
   // Place the identity status immediately below the identity.
   [self sizeTextFieldHeightToFit:identityField_];
   [self sizeTextFieldHeightToFit:identityStatusField_];
   CGFloat yPos = NSMaxY([identityField_ frame]) + kConnectionHeadlineSpacing;
   yPos = [self setYPositionOfView:identityStatusField_ to:yPos];
 
   // Lay out the Permissions tab.
+
   yPos = [self setYPositionOfView:cookiesView_ to:kFramePadding];
 
   // Put the link button for cookies and site data just below the cookie info.
   NSRect cookiesButtonFrame = [cookiesButton_ frame];
   cookiesButtonFrame.origin.y = yPos;
   cookiesButtonFrame.origin.x = kFramePadding;
   [cookiesButton_ setFrame:cookiesButtonFrame];
 
   // Put the permission info just below the link button.
   [self setYPositionOfView:permissionsView_
@@ skipping 37 matching lines @@
   yPos = [self setYPositionOfView:separatorAfterFirstVisit_
                                to:yPos + kVerticalSpacing];
   yPos += kVerticalSpacing;
   [self setYPositionOfView:helpButton_ to:yPos];
 
   // Adjust the tab view size and place it below the identity status.
 
   yPos = NSMaxY([identityStatusField_ frame]) + kTabStripTopSpacing;
   yPos = [self setYPositionOfView:segmentedControl_ to:yPos];
 
+  CGFloat connectionTabHeight = NSMaxY([helpButton_ frame]) + kVerticalSpacing;
+
   NSRect tabViewFrame = [tabView_ frame];
   tabViewFrame.origin.y = yPos;
-
-  // Determine the height of the tab contents.
-
-  CGFloat connectionTabHeight = std::max(
-      NSMaxY([firstVisitDescriptionField_ frame]),
-      NSMaxY([firstVisitIcon_ frame ]));
-  connectionTabHeight += kVerticalSpacing;
-
-  CGFloat permissionsTabHeight = NSMaxY([permissionsView_ frame]);
-  CGFloat tabContentHeight = std::max(connectionTabHeight,
-                                      permissionsTabHeight);
-  tabViewFrame.size.height = tabContentHeight +
-      NSHeight(tabViewFrame) - NSHeight([tabView_ contentRect]);
+  tabViewFrame.size.height =
+      std::max(connectionTabHeight, NSMaxY([permissionsView_ frame]));
+  tabViewFrame.size.width = contentWidth;
   [tabView_ setFrame:tabViewFrame];
 
   // Adjust the contentView to fit everything.
   [contentView_ setFrame:NSMakeRect(
-      0, 0, kWindowWidth, NSMaxY([tabView_ frame]))];
+      0, 0, NSWidth(tabViewFrame), NSMaxY(tabViewFrame))];
 
   [self sizeAndPositionWindow];
 }
 
 // Adjust the size of the window to match the size of the content, and position
 // the bubble anchor appropriately.
 - (void)sizeAndPositionWindow {
-  NSRect windowFrame =
-      NSMakeRect(0, 0, kWindowWidth, NSHeight([contentView_ frame]));
+  NSRect windowFrame = [contentView_ frame];
   windowFrame.size = [[[self window] contentView] convertSize:windowFrame.size
                                                        toView:nil];
   // Adjust the origin by the difference in height.
   windowFrame.origin = [[self window] frame].origin;
   windowFrame.origin.y -= NSHeight(windowFrame) -
       NSHeight([[self window] frame]);
 
   // Resize the window. Only animate if the window is visible, otherwise it
   // could be "growing" while it's opening, looking awkward.
   [[self window] setFrame:windowFrame
@@ skipping 54 matching lines @@
   CGFloat width = NSWidth([view frame]) - point.x - kFramePadding;
   NSRect frame = NSMakeRect(point.x, point.y, width, 100);
   scoped_nsobject<NSTextField> textField(
      [[NSTextField alloc] initWithFrame:frame]);
   [self configureTextFieldAsLabel:textField.get()];
   [textField setStringValue:base::SysUTF16ToNSString(text)];
   NSFont* font = bold ? [NSFont boldSystemFontOfSize:fontSize]
                       : [NSFont systemFontOfSize:fontSize];
   [textField setFont:font];
   [self sizeTextFieldHeightToFit:textField];
+  [textField setAutoresizingMask:NSViewWidthSizable];
   [view addSubview:textField.get()];
   return textField.get();
 }
 
 // Add an image as a subview of the given view, placed at a pre-determined x
 // position and the given y position. Return the new NSImageView.
 - (NSImageView*)addImageWithSize:(NSSize)size
                           toView:(NSView*)view
                          atPoint:(NSPoint)point {
   NSRect frame = NSMakeRect(point.x, point.y, size.width, size.height);
@@ skipping 22 matching lines @@
   NSRect frame = NSMakeRect(kFramePadding, 0, 100, 10);
   scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:frame]);
   scoped_nsobject<HyperlinkButtonCell> cell(
       [[HyperlinkButtonCell alloc] initTextCell:text]);
   [cell setControlSize:NSSmallControlSize];
   [button setCell:cell.get()];
   [button setButtonType:NSMomentaryPushInButton];
   [button setBezelStyle:NSRegularSquareBezelStyle];
   [view addSubview:button.get()];
 
-  // Call size-to-fit to fixup for the localized string.
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:button.get()];
   return button.get();
 }
 
+// Determine the size of a popup button with the given title.
+- (NSSize)sizeForPopUpButton:(NSPopUpButton*)button
+                   withTitle:(NSString*)title {
+  NSDictionary* textAttributes =
+      [NSDictionary dictionaryWithObject:[button font]
+                                  forKey:NSFontAttributeName];
+  NSSize titleSize = [title sizeWithAttributes:textAttributes];
+
+  NSRect buttonFrame = [button frame];
+  NSRect titleRect = [[button cell] titleRectForBounds:buttonFrame];
+  CGFloat width = titleSize.width + NSWidth(buttonFrame) - NSWidth(titleRect);
+
+  return NSMakeSize(width + kPermissionButtonTitleRightPadding,
+                    NSHeight(buttonFrame));
+}
+
 // Add a pop-up button for |permissionInfo| to the given view.
 - (NSPopUpButton*)addPopUpButtonForPermission:
     (const WebsiteSettingsUI::PermissionInfo&)permissionInfo
                                        toView:(NSView*)view
                                       atPoint:(NSPoint)point {
   // Use an arbitrary width and height; it will be sized to fit.
   NSRect frame = NSMakeRect(point.x, point.y, 1, 1);
   scoped_nsobject<NSPopUpButton> button(
       [[NSPopUpButton alloc] initWithFrame:frame pullsDown:NO]);
   [button setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
@@ skipping 33 matching lines @@
   scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
   string16 buttonTitle = WebsiteSettingsUI::PermissionActionToUIString(
       permissionInfo.setting,
       permissionInfo.default_setting,
       permissionInfo.source);
   [titleItem setTitle:base::SysUTF16ToNSString(buttonTitle)];
   [[button cell] setUsesItemFromMenu:NO];
   [[button cell] setMenuItem:titleItem.get()];
   [button sizeToFit];
 
-  // Determine the size of the title, and size the control accordingly.
-  // Using |sizeToFit| results in way too much extra space after the text.
-  NSDictionary* textAttributes =
-      [NSDictionary dictionaryWithObject:[button font]
-                                  forKey:NSFontAttributeName];
-  NSSize titleSize = [[button title] sizeWithAttributes:textAttributes];
+  // Determine the largest possible size for this button.
+  CGFloat maxTitleWidth = 0;
+  for (NSInteger i = 0; i < [button numberOfItems]; ++i) {
+    string16 title = WebsiteSettingsUI::PermissionActionToUIString(
+        static_cast<ContentSetting>([[button itemAtIndex:i] tag]),
+        permissionInfo.default_setting,
+        content_settings::SETTING_SOURCE_USER);
+    NSSize size = [self sizeForPopUpButton:button
+                                 withTitle:base::SysUTF16ToNSString(title)];
+    maxTitleWidth = std::max(maxTitleWidth, size.width);
+  }
+  // Ensure the containing view is large enough to contain the button with its
+  // widest possible title.
+  NSRect containerFrame = [view frame];
+  containerFrame.size.width = std::max(
+      NSWidth(containerFrame), point.x + maxTitleWidth + kFramePadding);
+  [view setFrame:containerFrame];
 
-  // Adjust the button frame to have a titleRect that exactly fits the title.
-  NSRect buttonFrame = [button frame];
-  NSRect titleRect = [[button cell] titleRectForBounds:buttonFrame];
-  buttonFrame.size.width =
-      titleSize.width + NSWidth(buttonFrame) - NSWidth(titleRect);
-  [button setFrame:buttonFrame];
-  DCHECK_EQ(NSWidth([[button cell] titleRectForBounds:buttonFrame]),
-            titleSize.width);
+  // Size the button to just fit the title.
+  [button setFrameSize:[self sizeForPopUpButton:button
+                                      withTitle:[button title]]];
 
   [view addSubview:button.get()];
   return button.get();
 }
 
 // Called when the user changes the selected segment in the segmented control.
 - (void)tabSelected:(id)sender {
   [tabView_ selectTabViewItemAtIndex:[segmentedControl_ selectedSegment]];
 }
 
 // Handler for the permission-changing menus.
 - (void)permissionValueChanged:(id)sender {
   DCHECK([sender isKindOfClass:[NSPopUpButton class]]);
   NSPopUpButton* button = static_cast<NSPopUpButton*>(sender);
   ContentSettingsType type = static_cast<ContentSettingsType>([button tag]);
   ContentSetting newSetting = static_cast<ContentSetting>(
       [[button selectedItem] tag]);
   if (presenter_.get())
     presenter_->OnSitePermissionChanged(type, newSetting);
 }
 
 // Adds a new row to the UI listing the permissions. Returns the amount of
 // vertical space that was taken up by the row.
-- (CGFloat)addPermission:
+- (NSPoint)addPermission:
     (const WebsiteSettingsUI::PermissionInfo&)permissionInfo
                   toView:(NSView*)view
                  atPoint:(NSPoint)point {
   // TODO(dubroy): Remove this check by refactoring GetPermissionIcon to take
   // the PermissionInfo object as its argument.
   ContentSetting setting = permissionInfo.setting == CONTENT_SETTING_DEFAULT ?
       permissionInfo.default_setting : permissionInfo.setting;
   NSImage* image = WebsiteSettingsUI::GetPermissionIcon(
       permissionInfo.type, setting).ToNSImage();
   NSImageView* imageView = [self addImageWithSize:[image size]
@@ skipping 28 matching lines @@
 
   // Align the icon with the text.
   [self alignPermissionIcon:imageView withTextField:label];
 
   // Permissions specified by policy or an extension cannot be changed.
   if (permissionInfo.source == content_settings::SETTING_SOURCE_EXTENSION ||
       permissionInfo.source == content_settings::SETTING_SOURCE_POLICY) {
     [button setEnabled:NO];
   }
 
-  return NSHeight([label frame]);
+  NSRect buttonFrame = [button frame];
+  return NSMakePoint(NSMaxX(buttonFrame), NSMaxY(buttonFrame));
 }
 
 // Align an image with a text field by vertically centering the image on
 // the cap height of the first line of text.
 - (void)alignPermissionIcon:(NSImageView*)imageView
               withTextField:(NSTextField*)textField {
   NSFont* font = [textField font];
 
   // Calculate the offset from the top of the text field.
   CGFloat capHeight = [font capHeight];
@@ skipping 22 matching lines @@
       UTF8ToUTF16(cookieInfo.cookie_source),
       base::IntToString16(cookieInfo.allowed),
       base::IntToString16(cookieInfo.blocked));
 
   NSTextField* label = [self addText:labelText
                             withSize:[NSFont smallSystemFontSize]
                                 bold:NO
                               toView:view
                              atPoint:point];
 
-  // Shrink the label to fit the text width.
-  NSSize requiredSize = [[label cell] cellSizeForBounds:[label frame]];
-  [label setFrameSize:requiredSize];
-
   // Align the icon with the text.
   [self alignPermissionIcon:imageView withTextField:label];
 
   return NSHeight([label frame]);
 }
 
 // Set the content of the identity and identity status fields.
 - (void)setIdentityInfo:(const WebsiteSettingsUI::IdentityInfo&)identityInfo {
   [identityField_ setStringValue:
       base::SysUTF8ToNSString(identityInfo.site_identity)];
@@ skipping 38 matching lines @@
   [cookiesView_ setSubviews:[NSArray array]];
   NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
 
   string16 sectionTitle = l10n_util::GetStringUTF16(
       IDS_WEBSITE_SETTINGS_TITLE_SITE_DATA);
   NSTextField* header = [self addText:sectionTitle
                              withSize:[NSFont smallSystemFontSize]
                                  bold:YES
                                toView:cookiesView_
                               atPoint:controlOrigin];
-  [self sizeTextFieldHeightToFit:header];
   controlOrigin.y += NSHeight([header frame]) + kPermissionsHeadlineSpacing;
 
   for (CookieInfoList::const_iterator it = cookieInfoList.begin();
        it != cookieInfoList.end();
        ++it) {
     controlOrigin.y += kPermissionsTabSpacing;
     CGFloat rowHeight = [self addCookieInfo:*it
                                      toView:cookiesView_
                                     atPoint:controlOrigin];
     controlOrigin.y += rowHeight;
   }
 
   controlOrigin.y += kPermissionsTabSpacing;
-  [cookiesView_ setFrameSize:NSMakeSize(kWindowWidth, controlOrigin.y)];
+  [cookiesView_ setFrameSize:
+      NSMakeSize(NSWidth([cookiesView_ frame]), controlOrigin.y)];
+
   [self performLayout];
 }
 
 - (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList {
+  // The contents of the permissions view can cause the whole window to get
+  // bigger, but currently permissions are always set before cookie info.
+  // Check to make sure that's still the case.
+  DCHECK_EQ(0U, [[cookiesView_ subviews] count]);
+
   [permissionsView_ setSubviews:[NSArray array]];
   NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
 
   string16 sectionTitle = l10n_util::GetStringUTF16(
       IDS_WEBSITE_SETTINGS_TITLE_SITE_PERMISSIONS);
   NSTextField* header = [self addText:sectionTitle
                              withSize:[NSFont smallSystemFontSize]
                                  bold:YES
                                toView:permissionsView_
                               atPoint:controlOrigin];
   [self sizeTextFieldHeightToFit:header];
   controlOrigin.y += NSHeight([header frame]) + kPermissionsHeadlineSpacing;
 
   for (PermissionInfoList::const_iterator permission =
            permissionInfoList.begin();
        permission != permissionInfoList.end();
        ++permission) {
     controlOrigin.y += kPermissionsTabSpacing;
-    CGFloat rowHeight = [self addPermission:*permission
-                                     toView:permissionsView_
-                                    atPoint:controlOrigin];
-    controlOrigin.y += rowHeight;
+    NSPoint rowBottomRight = [self addPermission:*permission
+                                          toView:permissionsView_
+                                         atPoint:controlOrigin];
+    controlOrigin.y = rowBottomRight.y;
   }
   controlOrigin.y += kFramePadding;
-  [permissionsView_ setFrameSize:NSMakeSize(kWindowWidth, controlOrigin.y)];
+  [permissionsView_ setFrameSize:
+      NSMakeSize(NSWidth([permissionsView_ frame]), controlOrigin.y)];
+  [self performLayout];
 }
 
 - (void)setFirstVisit:(const string16&)firstVisit {
   [firstVisitIcon_ setImage:
       WebsiteSettingsUI::GetFirstVisitIcon(firstVisit).ToNSImage()];
   [firstVisitDescriptionField_ setStringValue:
       base::SysUTF16ToNSString(firstVisit)];
   [self performLayout];
 }
 
@@ skipping 67 matching lines @@
   [bubble_controller_ setPermissionInfo:permission_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   [bubble_controller_ setSelectedTab:tab_id];
 }