Reintegrate 552 r66225-r66645....

chrome/browser/cocoa/content_setting_bubble_cocoa.mm

 // Copyright (c) 2010 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/cocoa/content_setting_bubble_cocoa.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
@@ skipping 373 matching lines @@
 
   // Resize container to fit its subviews, and window to fit the container.
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += containerHeight - NSHeight(containerFrame);
   [[self window] setFrame:windowFrame display:NO];
   containerFrame.size.height = containerHeight;
   [contentsContainer_ setFrame:containerFrame];
 }
 
 - (void)sizeToFitLoadPluginsButton {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableClickToPlay)) {
-    const ContentSettingBubbleModel::BubbleContent& content =
-        contentSettingBubbleModel_->bubble_content();
-    [loadAllPluginsButton_ setEnabled:content.load_plugins_link_enabled];
+  const ContentSettingBubbleModel::BubbleContent& content =
+      contentSettingBubbleModel_->bubble_content();
+  [loadAllPluginsButton_ setEnabled:content.load_plugins_link_enabled];
 
-    // Resize horizontally to fit button if necessary.
-    NSRect windowFrame = [[self window] frame];
-    int widthNeeded = NSWidth([loadAllPluginsButton_ frame]) +
-        2 * NSMinX([loadAllPluginsButton_ frame]);
-    if (NSWidth(windowFrame) < widthNeeded) {
-      windowFrame.size.width = widthNeeded;
-      [[self window] setFrame:windowFrame display:NO];
-    }
-  } else {
-    // Remove button and resize vertically.
-    int deltaY = kLoadAllPluginsButtonVerticalPadding +
-        NSHeight([loadAllPluginsButton_ frame]);
-    [loadAllPluginsButton_ removeFromSuperview];
-    NSRect frame = [[self window] frame];
-    frame.size.height -= deltaY;
-    [[self window] setFrame:frame display:NO];
-    NSPoint radioOrigin = [allowBlockRadioGroup_ frame].origin;
-    radioOrigin.y -= deltaY;
-    [allowBlockRadioGroup_ setFrameOrigin:radioOrigin];
-    [allowBlockRadioGroup_ setNeedsDisplay];
+  // Resize horizontally to fit button if necessary.
+  NSRect windowFrame = [[self window] frame];
+  int widthNeeded = NSWidth([loadAllPluginsButton_ frame]) +
+      2 * NSMinX([loadAllPluginsButton_ frame]);
+  if (NSWidth(windowFrame) < widthNeeded) {
+    windowFrame.size.width = widthNeeded;
+    [[self window] setFrame:windowFrame display:NO];
   }
 }
 
 - (void)sizeToFitManageDoneButtons {
   CGFloat actualWidth = NSWidth([[[self window] contentView] frame]);
   CGFloat requiredWidth = NSMaxX([manageButton_ frame]) + kManageDonePadding +
       NSWidth([[doneButton_ superview] frame]) - NSMinX([doneButton_ frame]);
   if (requiredWidth <= actualWidth || !doneButton_ || !manageButton_)
     return;
 
@@ skipping 61 matching lines @@
   DCHECK(i != popupLinks_.end());
   contentSettingBubbleModel_->OnPopupClicked(i->second);
 }
 
 - (void)clearGeolocationForCurrentHost:(id)sender {
   contentSettingBubbleModel_->OnClearLinkClicked();
   [self close];
 }
 
 @end  // ContentSettingBubbleController