Reintegrate 552 r66225-r66645....

chrome/app/nibs/ContentSettings.xib

Index: chrome/app/nibs/ContentSettings.xib
===================================================================
--- chrome/app/nibs/ContentSettings.xib	(revision 66837)
+++ chrome/app/nibs/ContentSettings.xib	(working copy)
@@ -2386,26 +2386,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedIndex: pluginsEnabledIndex</string>
-						<reference key="source" ref="564209934"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="564209934"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">selectedIndex: pluginsEnabledIndex</string>
-							<string key="NSBinding">selectedIndex</string>
-							<string key="NSKeyPath">pluginsEnabledIndex</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">selectedIndex: javaScriptEnabledIndex</string>
 						<reference key="source" ref="35110844"/>
 						<reference key="destination" ref="1001"/>
@@ -2648,6 +2628,30 @@
 					</object>
 					<int key="connectionID">213</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginDefaultSettingMatrix_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="564209934"/>
+					</object>
+					<int key="connectionID">216</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedTag: pluginsEnabledIndex</string>
+						<reference key="source" ref="564209934"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="564209934"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">selectedTag: pluginsEnabledIndex</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">pluginsEnabledIndex</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">217</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3608,7 +3612,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">215</int>
+			<int key="maxID">217</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3657,11 +3661,13 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>pluginDefaultSettingMatrix_</string>
 							<string>tabViewPicker_</string>
 							<string>tabView_</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSMatrix</string>
 							<string>TabViewPickerTable</string>
 							<string>NSTabView</string>
 						</object>