Merge 62782 - Revert 62189 - [Mac] Update Clear Browsing dialog for proper functioning from incognito windows, only hide server data delete if switch is not set. Mirror to r62147.

nib changes:
- for the five "clear server data" items, hidden bound to !owner.isSyncVisible
- for the "clear server data" button, enabled bound to owner.isSyncEnabled, enabled2 bound to !isClearing

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3674005

TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/3836003

TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/3798007

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@62950 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 29 insertions, 81 deletions

diff --git a/chrome/app/nibs/ClearBrowsingData.xib b/chrome/app/nibs/ClearBrowsingData.xib
index eb99359..1111d4b 100644
--- a/chrome/app/nibs/ClearBrowsingData.xib
+++ b/chrome/app/nibs/ClearBrowsingData.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="158"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1216,31 +1216,15 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: clearingStatus</string>
-						<reference key="source" ref="682642417"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="682642417"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: clearingStatus</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">clearingStatus</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">206</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="111752323"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="111752323"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1248,19 +1232,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">210</int>
+					<int key="connectionID">182</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="26218580"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="26218580"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1268,19 +1252,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">214</int>
+					<int key="connectionID">186</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="160073487"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="160073487"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1288,19 +1272,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">218</int>
+					<int key="connectionID">190</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="177347071"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="177347071"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1308,19 +1292,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">222</int>
+					<int key="connectionID">194</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="461151812"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="461151812"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1328,59 +1312,23 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">226</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isSyncEnabled</string>
-						<reference key="source" ref="909108966"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector" id="453378992">
-							<reference key="NSSource" ref="909108966"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: isSyncEnabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isSyncEnabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">229</int>
+					<int key="connectionID">198</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: isClearing</string>
-						<reference key="source" ref="909108966"/>
+						<string key="label">value: clearingStatus</string>
+						<reference key="source" ref="682642417"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="909108966"/>
+							<reference key="NSSource" ref="682642417"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled2: isClearing</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">isClearing</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="453378992"/>
+							<string key="NSLabel">value: clearingStatus</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">clearingStatus</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">232</int>
+					<int key="connectionID">206</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2126,7 +2074,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">232</int>
+			<int key="maxID">206</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">