Reintegrate 552 r66225-r66645....

chrome/browser/cocoa/content_settings_dialog_controller.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_settings_dialog_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 169 matching lines @@
       // flexible widths as this looks weird.
       [view setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
     }
   }
 
   NSString* label =
       l10n_util::GetNSStringWithFixup(IDS_CONTENT_SETTINGS_FEATURES_LABEL);
   label = [label stringByReplacingOccurrencesOfString:@":" withString:@""];
   [tabViewPicker_ setHeading:label];
 
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClickToPlay)) {
+    // The |pluginsEnabledIndex| property is bound to the selected *tag*,
+    // so we don't have to worry about index shifts when removing a row
+    // from the matrix.
+    [pluginDefaultSettingMatrix_ removeRow:kPluginsAskIndex];
+    NSArray* siblingViews = [[pluginDefaultSettingMatrix_ superview] subviews];
+    for (NSView* view in siblingViews) {
+      NSRect frame = [view frame];
+      if (frame.origin.y < [pluginDefaultSettingMatrix_ frame].origin.y) {
+        frame.origin.y +=
+            ([pluginDefaultSettingMatrix_ cellSize].height +
+             [pluginDefaultSettingMatrix_ intercellSpacing].height);
+        [view setFrame:frame];
+      }
+    }
+  }
+
   NSRect frame = [[self window] frame];
   frame.origin.y -= windowDelta;
   frame.size.height += windowDelta;
   [[self window] setFrame:frame display:NO];
 }
 
 // NSWindowDelegate method.
 - (void)windowWillClose:(NSNotification*)notification {
   [self autorelease];
   g_instance = nil;
@@ skipping 223 matching lines @@
       disabler(observer_.get());
   profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, setting);
 }
 
 - (NSInteger)pluginsEnabledIndex {
   HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
   ContentSetting setting =
       map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
   switch (setting) {
-    case CONTENT_SETTING_ALLOW: return kPluginsAllowIndex;
-    case CONTENT_SETTING_ASK:   return kPluginsAskIndex;
-    case CONTENT_SETTING_BLOCK: return kPluginsBlockIndex;
+    case CONTENT_SETTING_ALLOW:
+      return kPluginsAllowIndex;
+    case CONTENT_SETTING_ASK:
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClickToPlay))
+        return kPluginsAskIndex;
+      // Fall through to the next case.
+    case CONTENT_SETTING_BLOCK:
+      return kPluginsBlockIndex;
     default:
       NOTREACHED();
       return kPluginsAllowIndex;
   }
 }
 
 - (void)setPopupsEnabledIndex:(NSInteger)value {
   ContentSetting setting = value == kContentSettingsEnabledIndex ?
       CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   ContentSettingsDialogControllerInternal::PrefObserverDisabler
@@ skipping 102 matching lines @@
     [self willChangeValueForKey:@"geolocationSettingIndex"];
     [self didChangeValueForKey:@"geolocationSettingIndex"];
   }
   if (*prefName == prefs::kDesktopNotificationDefaultContentSetting) {
     [self willChangeValueForKey:@"notificationsSettingIndex"];
     [self didChangeValueForKey:@"notificationsSettingIndex"];
   }
 }
 
 @end