[Mac] Better code sharing between cookie tree and cookie prompt

Refactored code so that the class that encapsulates cookies details
is shared between the cookie tree and cookie prompt on the mac.

xib changes: Fixed the bindings in all of the subviews in the details view to use the new shared details class. Also added a currently hidden popup menu for selecting the cookie expiration time in the prompt details view--this needs to be wired up in a separate CL.

BUG=http://crbug.com/38348
TEST=added unit tests for the new class, manual testing of cookie tree and cookie prompt dialog

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41949 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 314 insertions, 164 deletions

diff --git a/chrome/app/nibs/CookieDetailsView.xib b/chrome/app/nibs/CookieDetailsView.xib
index 6cd519c..3c30664 100644
--- a/chrome/app/nibs/CookieDetailsView.xib
+++ b/chrome/app/nibs/CookieDetailsView.xib
@@ -312,6 +312,76 @@
 													<reference key="NSTextColor" ref="503975814"/>
 												</object>
 											</object>
+											<object class="NSCustomView" id="440361667">
+												<reference key="NSNextResponder" ref="430082147"/>
+												<int key="NSvFlags">-2147483380</int>
+												<object class="NSMutableArray" key="NSSubviews">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<object class="NSPopUpButton" id="161048022">
+														<reference key="NSNextResponder" ref="440361667"/>
+														<int key="NSvFlags">266</int>
+														<string key="NSFrameSize">{200, 26}</string>
+														<reference key="NSSuperview" ref="440361667"/>
+														<bool key="NSEnabled">YES</bool>
+														<object class="NSPopUpButtonCell" key="NSCell" id="173617932">
+															<int key="NSCellFlags">-2076049856</int>
+															<int key="NSCellFlags2">2048</int>
+															<reference key="NSSupport" ref="123687714"/>
+															<reference key="NSControlView" ref="161048022"/>
+															<int key="NSButtonFlags">109199615</int>
+															<int key="NSButtonFlags2">129</int>
+															<string key="NSAlternateContents"/>
+															<string key="NSKeyEquivalent"/>
+															<int key="NSPeriodicDelay">400</int>
+															<int key="NSPeriodicInterval">75</int>
+															<object class="NSMenuItem" key="NSMenuItem" id="628665972">
+																<reference key="NSMenu" ref="424593479"/>
+																<string key="NSTitle">Item 1</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<int key="NSState">1</int>
+																<object class="NSCustomResource" key="NSOnImage" id="825310241">
+																	<string key="NSClassName">NSImage</string>
+																	<string key="NSResourceName">NSMenuCheckmark</string>
+																</object>
+																<object class="NSCustomResource" key="NSMixedImage" id="41309840">
+																	<string key="NSClassName">NSImage</string>
+																	<string key="NSResourceName">NSMenuMixedState</string>
+																</object>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="173617932"/>
+															</object>
+															<bool key="NSMenuItemRespectAlignment">YES</bool>
+															<object class="NSMenu" key="NSMenu" id="424593479">
+																<string key="NSTitle">OtherViews</string>
+																<object class="NSMutableArray" key="NSMenuItems">
+																	<bool key="EncodedWithXMLCoder">YES</bool>
+																	<reference ref="628665972"/>
+																	<object class="NSMenuItem" id="735521972">
+																		<reference key="NSMenu" ref="424593479"/>
+																		<string key="NSTitle">Item 2</string>
+																		<string key="NSKeyEquiv"/>
+																		<int key="NSKeyEquivModMask">1048576</int>
+																		<int key="NSMnemonicLoc">2147483647</int>
+																		<reference key="NSOnImage" ref="825310241"/>
+																		<reference key="NSMixedImage" ref="41309840"/>
+																		<string key="NSAction">_popUpItemAction:</string>
+																		<reference key="NSTarget" ref="173617932"/>
+																	</object>
+																</object>
+															</object>
+															<int key="NSPreferredEdge">1</int>
+															<bool key="NSUsesItemFromMenu">YES</bool>
+															<bool key="NSAltersState">YES</bool>
+															<int key="NSArrowPosition">2</int>
+														</object>
+													</object>
+												</object>
+												<string key="NSFrame">{{3, 16}, {200, 26}}</string>
+												<reference key="NSSuperview" ref="430082147"/>
+												<string key="NSClassName">GTMWidthBasedTweaker</string>
+											</object>
 										</object>
 										<string key="NSFrame">{{76, -18}, {386, 207}}</string>
 										<reference key="NSSuperview" ref="238462753"/>
@@ -832,25 +902,24 @@
 			<object class="NSObjectController" id="581169699">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>name</string>
-					<string>content</string>
-					<string>domain</string>
-					<string>path</string>
-					<string>sendFor</string>
-					<string>created</string>
-					<string>expires</string>
-					<string>fileSize</string>
-					<string>lastModified</string>
-					<string>databaseDescription</string>
-					<string>isLocalStorageTreeDetails</string>
-					<string>isFolderOrCookieTreeDetails</string>
-					<string>isDatabaseTreeDetails</string>
-					<string>isDatabasePromptDetails</string>
-					<string>isLocalStoragePromptDetails</string>
-					<string>localStorageKey</string>
-					<string>localStorageValue</string>
-					<string>count</string>
 					<string>@count</string>
+					<string>details.expires</string>
+					<string>details.created</string>
+					<string>details.sendFor</string>
+					<string>details.path</string>
+					<string>details.domain</string>
+					<string>details.content</string>
+					<string>details.name</string>
+					<string>details.lastModified</string>
+					<string>details.fileSize</string>
+					<string>details.databaseDescription</string>
+					<string>details.localStorageValue</string>
+					<string>details.localStorageKey</string>
+					<string>details.shouldShowLocalStoragePromptDetailsView</string>
+					<string>details.shouldShowDatabasePromptDetailsView</string>
+					<string>details.shouldShowDatabaseTreeDetailsView</string>
+					<string>details.shouldShowLocalStorageTreeDetailsView</string>
+					<string>details.shouldHideCookieDetailsView</string>
 				</object>
 				<string key="NSObjectClassName">CocoaCookieTreeNode</string>
 				<bool key="NSEditable">YES</bool>
@@ -948,15 +1017,15 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.expires</string>
+						<string key="label">value: content.details.expires</string>
 						<reference key="source" ref="860444829"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="860444829"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.expires</string>
+							<string key="NSLabel">value: content.details.expires</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.expires</string>
+							<string key="NSKeyPath">content.details.expires</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -977,19 +1046,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">539</int>
+					<int key="connectionID">582</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.created</string>
+						<string key="label">value: content.details.created</string>
 						<reference key="source" ref="923803282"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="923803282"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.created</string>
+							<string key="NSLabel">value: content.details.created</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.created</string>
+							<string key="NSKeyPath">content.details.created</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1010,19 +1079,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">540</int>
+					<int key="connectionID">583</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.sendFor</string>
+						<string key="label">value: content.details.sendFor</string>
 						<reference key="source" ref="753982819"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="753982819"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.sendFor</string>
+							<string key="NSLabel">value: content.details.sendFor</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.sendFor</string>
+							<string key="NSKeyPath">content.details.sendFor</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1043,19 +1112,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">541</int>
+					<int key="connectionID">584</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.path</string>
+						<string key="label">value: content.details.path</string>
 						<reference key="source" ref="52584846"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="52584846"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.path</string>
+							<string key="NSLabel">value: content.details.path</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.path</string>
+							<string key="NSKeyPath">content.details.path</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1076,19 +1145,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">542</int>
+					<int key="connectionID">585</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.domain</string>
+						<string key="label">value: content.details.domain</string>
 						<reference key="source" ref="190839613"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="190839613"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.domain</string>
+							<string key="NSLabel">value: content.details.domain</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.domain</string>
+							<string key="NSKeyPath">content.details.domain</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1109,19 +1178,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">543</int>
+					<int key="connectionID">586</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.content</string>
+						<string key="label">value: content.details.content</string>
 						<reference key="source" ref="589731962"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="589731962"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.content</string>
+							<string key="NSLabel">value: content.details.content</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.content</string>
+							<string key="NSKeyPath">content.details.content</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1142,19 +1211,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">544</int>
+					<int key="connectionID">587</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.name</string>
+						<string key="label">value: content.details.name</string>
 						<reference key="source" ref="897570455"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="897570455"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.name</string>
+							<string key="NSLabel">value: content.details.name</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.name</string>
+							<string key="NSKeyPath">content.details.name</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1175,19 +1244,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">545</int>
+					<int key="connectionID">588</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.lastModified</string>
+						<string key="label">value: content.details.lastModified</string>
 						<reference key="source" ref="826212411"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="826212411"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.lastModified</string>
+							<string key="NSLabel">value: content.details.lastModified</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.lastModified</string>
+							<string key="NSKeyPath">content.details.lastModified</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1208,19 +1277,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">546</int>
+					<int key="connectionID">589</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.fileSize</string>
+						<string key="label">value: content.details.fileSize</string>
 						<reference key="source" ref="236918317"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="236918317"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.fileSize</string>
+							<string key="NSLabel">value: content.details.fileSize</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.fileSize</string>
+							<string key="NSKeyPath">content.details.fileSize</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1241,19 +1310,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">547</int>
+					<int key="connectionID">590</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.domain</string>
+						<string key="label">value: content.details.domain</string>
 						<reference key="source" ref="280427712"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="280427712"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.domain</string>
+							<string key="NSLabel">value: content.details.domain</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.domain</string>
+							<string key="NSKeyPath">content.details.domain</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1274,19 +1343,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">548</int>
+					<int key="connectionID">591</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.lastModified</string>
+						<string key="label">value: content.details.lastModified</string>
 						<reference key="source" ref="668449282"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="668449282"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.lastModified</string>
+							<string key="NSLabel">value: content.details.lastModified</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.lastModified</string>
+							<string key="NSKeyPath">content.details.lastModified</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1307,19 +1376,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">549</int>
+					<int key="connectionID">592</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.fileSize</string>
+						<string key="label">value: content.details.fileSize</string>
 						<reference key="source" ref="190535033"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="190535033"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.fileSize</string>
+							<string key="NSLabel">value: content.details.fileSize</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.fileSize</string>
+							<string key="NSKeyPath">content.details.fileSize</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1340,19 +1409,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">550</int>
+					<int key="connectionID">593</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.databaseDescription</string>
+						<string key="label">value: content.details.databaseDescription</string>
 						<reference key="source" ref="223492865"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="223492865"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.databaseDescription</string>
+							<string key="NSLabel">value: content.details.databaseDescription</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.databaseDescription</string>
+							<string key="NSKeyPath">content.details.databaseDescription</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMutableArray" key="dict.sortedKeys">
@@ -1373,19 +1442,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">551</int>
+					<int key="connectionID">594</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.domain</string>
-						<reference key="source" ref="226333841"/>
+						<string key="label">value: content.details.name</string>
+						<reference key="source" ref="875875171"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="226333841"/>
+							<reference key="NSSource" ref="875875171"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.domain</string>
+							<string key="NSLabel">value: content.details.name</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.domain</string>
+							<string key="NSKeyPath">content.details.name</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSRaisesForNotApplicableKeys</string>
 								<reference key="NS.object.0" ref="6"/>
@@ -1393,19 +1462,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">552</int>
+					<int key="connectionID">595</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.name</string>
-						<reference key="source" ref="875875171"/>
+						<string key="label">value: content.details.domain</string>
+						<reference key="source" ref="226333841"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="875875171"/>
+							<reference key="NSSource" ref="226333841"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.name</string>
+							<string key="NSLabel">value: content.details.domain</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.name</string>
+							<string key="NSKeyPath">content.details.domain</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSRaisesForNotApplicableKeys</string>
 								<reference key="NS.object.0" ref="6"/>
@@ -1413,19 +1482,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">553</int>
+					<int key="connectionID">596</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.domain</string>
-						<reference key="source" ref="460351266"/>
+						<string key="label">value: content.details.localStorageValue</string>
+						<reference key="source" ref="160681062"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="460351266"/>
+							<reference key="NSSource" ref="160681062"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.domain</string>
+							<string key="NSLabel">value: content.details.localStorageValue</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.domain</string>
+							<string key="NSKeyPath">content.details.localStorageValue</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSRaisesForNotApplicableKeys</string>
 								<reference key="NS.object.0" ref="6"/>
@@ -1433,19 +1502,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">554</int>
+					<int key="connectionID">597</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.localStorageKey</string>
+						<string key="label">value: content.details.localStorageKey</string>
 						<reference key="source" ref="1020137061"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="1020137061"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.localStorageKey</string>
+							<string key="NSLabel">value: content.details.localStorageKey</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.localStorageKey</string>
+							<string key="NSKeyPath">content.details.localStorageKey</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSRaisesForNotApplicableKeys</string>
 								<reference key="NS.object.0" ref="6"/>
@@ -1453,19 +1522,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">555</int>
+					<int key="connectionID">598</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.localStorageValue</string>
-						<reference key="source" ref="160681062"/>
+						<string key="label">value: content.details.domain</string>
+						<reference key="source" ref="460351266"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="160681062"/>
+							<reference key="NSSource" ref="460351266"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.localStorageValue</string>
+							<string key="NSLabel">value: content.details.domain</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.localStorageValue</string>
+							<string key="NSKeyPath">content.details.domain</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSRaisesForNotApplicableKeys</string>
 								<reference key="NS.object.0" ref="6"/>
@@ -1473,19 +1542,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">556</int>
+					<int key="connectionID">599</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: content.isLocalStorageTreeDetails</string>
-						<reference key="source" ref="244286403"/>
+						<string key="label">hidden: content.details.shouldShowLocalStoragePromptDetailsView</string>
+						<reference key="source" ref="748119605"/>
 						<reference key="destination" ref="581169699"/>
-						<object class="NSNibBindingConnector" key="connector" id="1022309843">
-							<reference key="NSSource" ref="244286403"/>
+						<object class="NSNibBindingConnector" key="connector" id="775690993">
+							<reference key="NSSource" ref="748119605"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">hidden: content.isLocalStorageTreeDetails</string>
+							<string key="NSLabel">hidden: content.details.shouldShowLocalStoragePromptDetailsView</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">content.isLocalStorageTreeDetails</string>
+							<string key="NSKeyPath">content.details.shouldShowLocalStoragePromptDetailsView</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1493,15 +1562,15 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">557</int>
+					<int key="connectionID">600</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden2: selection.@count</string>
-						<reference key="source" ref="244286403"/>
+						<reference key="source" ref="748119605"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="244286403"/>
+							<reference key="NSSource" ref="748119605"/>
 							<reference key="NSDestination" ref="581169699"/>
 							<string key="NSLabel">hidden2: selection.@count</string>
 							<string key="NSBinding">hidden2</string>
@@ -1525,43 +1594,23 @@
 									<string>NSNegateBoolean</string>
 								</object>
 							</object>
-							<reference key="NSPreviousConnector" ref="1022309843"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">558</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: content.isFolderOrCookieTreeDetails</string>
-						<reference key="source" ref="238462753"/>
-						<reference key="destination" ref="581169699"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="238462753"/>
-							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">hidden: content.isFolderOrCookieTreeDetails</string>
-							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">content.isFolderOrCookieTreeDetails</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
+							<reference key="NSPreviousConnector" ref="775690993"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">559</int>
+					<int key="connectionID">601</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: content.isDatabaseTreeDetails</string>
-						<reference key="source" ref="405138257"/>
+						<string key="label">hidden: content.details.shouldShowDatabasePromptDetailsView</string>
+						<reference key="source" ref="654642025"/>
 						<reference key="destination" ref="581169699"/>
-						<object class="NSNibBindingConnector" key="connector" id="882980630">
-							<reference key="NSSource" ref="405138257"/>
+						<object class="NSNibBindingConnector" key="connector" id="979803685">
+							<reference key="NSSource" ref="654642025"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">hidden: content.isDatabaseTreeDetails</string>
+							<string key="NSLabel">hidden: content.details.shouldShowDatabasePromptDetailsView</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">content.isDatabaseTreeDetails</string>
+							<string key="NSKeyPath">content.details.shouldShowDatabasePromptDetailsView</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1569,15 +1618,15 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">560</int>
+					<int key="connectionID">602</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden2: selection.@count</string>
-						<reference key="source" ref="405138257"/>
+						<reference key="source" ref="654642025"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="405138257"/>
+							<reference key="NSSource" ref="654642025"/>
 							<reference key="NSDestination" ref="581169699"/>
 							<string key="NSLabel">hidden2: selection.@count</string>
 							<string key="NSBinding">hidden2</string>
@@ -1601,23 +1650,23 @@
 									<string>NSNegateBoolean</string>
 								</object>
 							</object>
-							<reference key="NSPreviousConnector" ref="882980630"/>
+							<reference key="NSPreviousConnector" ref="979803685"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">561</int>
+					<int key="connectionID">603</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: content.isDatabasePromptDetails</string>
-						<reference key="source" ref="654642025"/>
+						<string key="label">hidden: content.details.shouldShowDatabaseTreeDetailsView</string>
+						<reference key="source" ref="405138257"/>
 						<reference key="destination" ref="581169699"/>
-						<object class="NSNibBindingConnector" key="connector" id="740067409">
-							<reference key="NSSource" ref="654642025"/>
+						<object class="NSNibBindingConnector" key="connector" id="381511258">
+							<reference key="NSSource" ref="405138257"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">hidden: content.isDatabasePromptDetails</string>
+							<string key="NSLabel">hidden: content.details.shouldShowDatabaseTreeDetailsView</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">content.isDatabasePromptDetails</string>
+							<string key="NSKeyPath">content.details.shouldShowDatabaseTreeDetailsView</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1625,15 +1674,15 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">562</int>
+					<int key="connectionID">604</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden2: selection.@count</string>
-						<reference key="source" ref="654642025"/>
+						<reference key="source" ref="405138257"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="654642025"/>
+							<reference key="NSSource" ref="405138257"/>
 							<reference key="NSDestination" ref="581169699"/>
 							<string key="NSLabel">hidden2: selection.@count</string>
 							<string key="NSBinding">hidden2</string>
@@ -1657,23 +1706,23 @@
 									<string>NSNegateBoolean</string>
 								</object>
 							</object>
-							<reference key="NSPreviousConnector" ref="740067409"/>
+							<reference key="NSPreviousConnector" ref="381511258"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">563</int>
+					<int key="connectionID">605</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: content.isLocalStoragePromptDetails</string>
-						<reference key="source" ref="748119605"/>
+						<string key="label">hidden: content.details.shouldShowLocalStorageTreeDetailsView</string>
+						<reference key="source" ref="244286403"/>
 						<reference key="destination" ref="581169699"/>
-						<object class="NSNibBindingConnector" key="connector" id="839403343">
-							<reference key="NSSource" ref="748119605"/>
+						<object class="NSNibBindingConnector" key="connector" id="455345162">
+							<reference key="NSSource" ref="244286403"/>
 							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">hidden: content.isLocalStoragePromptDetails</string>
+							<string key="NSLabel">hidden: content.details.shouldShowLocalStorageTreeDetailsView</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">content.isLocalStoragePromptDetails</string>
+							<string key="NSKeyPath">content.details.shouldShowLocalStorageTreeDetailsView</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1681,15 +1730,15 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">564</int>
+					<int key="connectionID">606</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden2: selection.@count</string>
-						<reference key="source" ref="748119605"/>
+						<reference key="source" ref="244286403"/>
 						<reference key="destination" ref="581169699"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="748119605"/>
+							<reference key="NSSource" ref="244286403"/>
 							<reference key="NSDestination" ref="581169699"/>
 							<string key="NSLabel">hidden2: selection.@count</string>
 							<string key="NSBinding">hidden2</string>
@@ -1713,11 +1762,43 @@
 									<string>NSNegateBoolean</string>
 								</object>
 							</object>
-							<reference key="NSPreviousConnector" ref="839403343"/>
+							<reference key="NSPreviousConnector" ref="455345162"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">607</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: content.details.expires</string>
+						<reference key="source" ref="628665972"/>
+						<reference key="destination" ref="581169699"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="628665972"/>
+							<reference key="NSDestination" ref="581169699"/>
+							<string key="NSLabel">value: content.details.expires</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">content.details.expires</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">565</int>
+					<int key="connectionID">609</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: content.details.shouldHideCookieDetailsView</string>
+						<reference key="source" ref="238462753"/>
+						<reference key="destination" ref="581169699"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="238462753"/>
+							<reference key="NSDestination" ref="581169699"/>
+							<string key="NSLabel">hidden: content.details.shouldHideCookieDetailsView</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">content.details.shouldHideCookieDetailsView</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">611</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2034,6 +2115,7 @@
 							<reference ref="753982819"/>
 							<reference ref="923803282"/>
 							<reference ref="860444829"/>
+							<reference ref="440361667"/>
 						</object>
 						<reference key="parent" ref="238462753"/>
 					</object>
@@ -2457,6 +2539,53 @@
 						<reference key="object" ref="669425040"/>
 						<reference key="parent" ref="448024654"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">577</int>
+						<reference key="object" ref="440361667"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="161048022"/>
+						</object>
+						<reference key="parent" ref="430082147"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">566</int>
+						<reference key="object" ref="161048022"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="173617932"/>
+						</object>
+						<reference key="parent" ref="440361667"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">567</int>
+						<reference key="object" ref="173617932"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="424593479"/>
+						</object>
+						<reference key="parent" ref="161048022"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">568</int>
+						<reference key="object" ref="424593479"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="735521972"/>
+							<reference ref="628665972"/>
+						</object>
+						<reference key="parent" ref="173617932"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">570</int>
+						<reference key="object" ref="735521972"/>
+						<reference key="parent" ref="424593479"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">569</int>
+						<reference key="object" ref="628665972"/>
+						<reference key="parent" ref="424593479"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2548,13 +2677,23 @@
 					<string>482.IBPluginDependency</string>
 					<string>483.IBPluginDependency</string>
 					<string>484.IBPluginDependency</string>
+					<string>566.IBPluginDependency</string>
+					<string>567.IBPluginDependency</string>
+					<string>568.IBEditorWindowLastContentRect</string>
+					<string>568.IBPluginDependency</string>
+					<string>569.IBPluginDependency</string>
+					<string>570.IBPluginDependency</string>
+					<string>577.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{640, 45}, {464, 191}}</string>
+					<string>{{28, 111}, {464, 191}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2635,6 +2774,10 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{702, 79}, {200, 43}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
@@ -2658,7 +2801,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">565</int>
+			<int key="maxID">611</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2750,6 +2893,13 @@
 					<reference key="sourceIdentifier" ref="489627463"/>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItem</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/nsmenuitem_additions.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>