[HBD] Update Cocoa to match removed controls from Plugins Blocked popup.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.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/content_settings/content_setting_bubble_cocoa.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 454 matching lines @@
   for (const ContentSettingBubbleModel::ListItem& listItem : listItems) {
     NSImage* image = listItem.image.AsNSImage();
     NSRect frame = NSMakeRect(
         NSMinX(radioFrame), topLinkY - kLinkLineHeight * row, 200, kLinkHeight);
     if (listItem.has_link) {
       NSButton* button =
           [self hyperlinkButtonWithFrame:frame
                                    title:base::SysUTF8ToNSString(listItem.title)
                                     icon:image
                           referenceFrame:radioFrame];
+      [button setAutoresizingMask:NSViewMinYMargin];
       [[self bubble] addSubview:button];
       popupLinks_[button] = row++;
     } else {
       NSTextField* label =
           LabelWithFrame(base::SysUTF8ToNSString(listItem.title), frame);
       SetControlSize(label, NSSmallControlSize);
+      [label setAutoresizingMask:NSViewMinYMargin];
       [[self bubble] addSubview:label];
       row++;
     }
   }
 }
 
 - (void)initializeGeoLists {
   // Cocoa has its origin in the lower left corner. This means elements are
   // added from bottom to top, which explains why loops run backwards and the
   // order of operations is the other way than on Linux/Windows.
@@ skipping 284 matching lines @@
   size = [[[self window] contentView] convertSize:size toView:nil];
   NSRect frame = [[self window] frame];
   frame.origin.x -= size.width;
   frame.size.width += size.width;
   [[self window] setFrame:frame display:NO];
 }
 
 - (void)awakeFromNib {
   [super awakeFromNib];
 
+  ContentSettingSimpleBubbleModel* simple_bubble =
+      contentSettingBubbleModel_->AsSimpleBubbleModel();
+
   [[self bubble] setArrowLocation:info_bubble::kTopRight];
 
   // Adapt window size to bottom buttons. Do this before all other layouting.
-  [self initManageDoneButtons];
+  if (simple_bubble && !simple_bubble->bubble_content().manage_text.empty())
+    [self initManageDoneButtons];
 
   [self initializeTitle];
   [self initializeMessage];
 
   // Note that the per-content-type methods and |initializeRadioGroup| below
   // must be kept in the correct order, as they make interdependent adjustments
   // of the bubble's height.
-  ContentSettingSimpleBubbleModel* simple_bubble =
-      contentSettingBubbleModel_->AsSimpleBubbleModel();
   if (simple_bubble &&
       simple_bubble->content_type() == CONTENT_SETTINGS_TYPE_PLUGINS) {
-    [self sizeToFitLoadButton];
+    if (!simple_bubble->bubble_content().custom_link.empty())
+      [self sizeToFitLoadButton];
+
     [self initializeBlockedPluginsList];
   }
 
   if (allowBlockRadioGroup_)  // Some xibs do not bind |allowBlockRadioGroup_|.
     [self initializeRadioGroup];
 
   if (simple_bubble) {
     ContentSettingsType type = simple_bubble->content_type();
 
     if (type == CONTENT_SETTINGS_TYPE_POPUPS ||
         type == CONTENT_SETTINGS_TYPE_PLUGINS)
       [self initializeItemList];
     if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
       [self initializeGeoLists];
     if (type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX)
       [self initializeMIDISysExLists];
+
+    // For plugins, many controls are now removed. Remove them after the item
+    // list has been placed to preserve the existing layout logic.
+    if (type == CONTENT_SETTINGS_TYPE_PLUGINS) {
+      // The radio group is no longer applicable to plugins.
+      int delta = NSHeight([allowBlockRadioGroup_ frame]);
+      [allowBlockRadioGroup_ removeFromSuperview];
+
+      // Remove the "Load All" button if the model specifes it as empty.
+      if (simple_bubble->bubble_content().custom_link.empty()) {
+        delta += NSHeight([loadButton_ frame]);
+        [loadButton_ removeFromSuperview];
+      }
+
+      // Remove the "Manage" button if the model specifies it as empty.
+      if (simple_bubble->bubble_content().manage_text.empty())
+        [manageButton_ removeFromSuperview];
+
+      NSRect frame = [[self window] frame];
+      frame.size.height -= delta;
+      [[self window] setFrame:frame display:NO];
+    }
   }
 
   if (contentSettingBubbleModel_->AsMediaStreamBubbleModel())
     [self initializeMediaMenus];
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Actual application logic
 
 - (IBAction)allowBlockToggled:(id)sender {
@@ skipping 54 matching lines @@
 
 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
   return &mediaMenus_;
 }
 
 - (LocationBarDecoration*)decorationForBubble {
   return decoration_;
 }
 
 @end  // ContentSettingBubbleController