Fixes up bookmark bubbles and the browser window so that they shut down correctly.

BookmarkBubbleController has been made an NSWindowController instead of the
view controller that it used to be, and now loads its window from the nib instead
of creating it on the fly. Also cleans up fullscreen mode so that the window
referenced from browser_window_controller stays constant instead of having
[self window] and window_ potentially pointing at two different windows.

BookmarkBubble.xib has been modified so that it instantiates a window containing
a bubble view instead of just instantiating a view.

BUG=25054
TEST=Try going in and out of full screen mode. Try bringing up a bookmark bubble by clicking on the star. Try creating a pile of windows and then quitting,
Review URL: http://codereview.chromium.org/333017

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

1 files changed, 491 insertions, 409 deletions

diff --git a/chrome/app/nibs/BookmarkBubble.xib b/chrome/app/nibs/BookmarkBubble.xib
index 7d144df..4188850 100644
--- a/chrome/app/nibs/BookmarkBubble.xib
+++ b/chrome/app/nibs/BookmarkBubble.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9L30</string>
+		<string key="IBDocument.SystemVersion">9L31a</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
 		<string key="IBDocument.AppKitVersion">949.54</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="39"/>
+			<integer value="34"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -34,344 +34,365 @@
 			<object class="NSCustomObject" id="1004">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSCustomView" id="1005">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">268</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="559397096">
-						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 106}, {340, 19}}</string>
-						<reference key="NSSuperview" ref="1005"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="368795405">
-							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272630784</int>
-							<string key="NSContents">^IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK</string>
-							<object class="NSFont" key="NSSupport">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">1.300000e+01</double>
-								<int key="NSfFlags">1044</int>
-							</object>
-							<reference key="NSControlView" ref="559397096"/>
-							<object class="NSColor" key="NSBackgroundColor" id="152587692">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlColor</string>
-								<object class="NSColor" key="NSColor" id="748407352">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="1000275559">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlTextColor</string>
-								<object class="NSColor" key="NSColor" id="947148753">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSCustomView" id="46287572">
-						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">289</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSButton" id="82356437">
-								<reference key="NSNextResponder" ref="46287572"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{111, 13}, {96, 28}}</string>
-								<reference key="NSSuperview" ref="46287572"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="307931553">
-									<int key="NSCellFlags">67239424</int>
-									<int key="NSCellFlags2">134348800</int>
-									<string key="NSContents">^IDS_CLOSE</string>
-									<object class="NSFont" key="NSSupport" id="26">
-										<string key="NSName">LucidaGrande</string>
-										<double key="NSSize">1.100000e+01</double>
-										<int key="NSfFlags">3100</int>
+			<object class="NSCustomObject" id="704223344">
+				<string key="NSClassName">ChromeUILocalizer</string>
+			</object>
+			<object class="NSCustomObject" id="279326944">
+				<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
+			</object>
+			<object class="NSWindowTemplate" id="588083889">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 365}, {374, 145}}</string>
+				<int key="NSWTFlags">603979776</int>
+				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowClass">BookmarkBubbleWindow</string>
+				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<object class="NSView" key="NSWindowView" id="45997296">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSCustomView" id="1005">
+							<reference key="NSNextResponder" ref="45997296"/>
+							<int key="NSvFlags">268</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSTextField" id="559397096">
+									<reference key="NSNextResponder" ref="1005"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{17, 106}, {340, 19}}</string>
+									<reference key="NSSuperview" ref="1005"/>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="368795405">
+										<int key="NSCellFlags">68288064</int>
+										<int key="NSCellFlags2">272630784</int>
+										<string key="NSContents">^IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK</string>
+										<object class="NSFont" key="NSSupport">
+											<string key="NSName">LucidaGrande</string>
+											<double key="NSSize">1.300000e+01</double>
+											<int key="NSfFlags">1044</int>
+										</object>
+										<reference key="NSControlView" ref="559397096"/>
+										<object class="NSColor" key="NSBackgroundColor" id="152587692">
+											<int key="NSColorSpace">6</int>
+											<string key="NSCatalogName">System</string>
+											<string key="NSColorName">controlColor</string>
+											<object class="NSColor" key="NSColor" id="748407352">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+											</object>
+										</object>
+										<object class="NSColor" key="NSTextColor" id="1000275559">
+											<int key="NSColorSpace">6</int>
+											<string key="NSCatalogName">System</string>
+											<string key="NSColorName">controlTextColor</string>
+											<object class="NSColor" key="NSColor" id="947148753">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MAA</bytes>
+											</object>
+										</object>
 									</object>
-									<reference key="NSControlView" ref="82356437"/>
-									<int key="NSButtonFlags">-2038284033</int>
-									<int key="NSButtonFlags2">129</int>
-									<string key="NSAlternateContents"/>
-									<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-									<int key="NSPeriodicDelay">200</int>
-									<int key="NSPeriodicInterval">25</int>
 								</object>
-							</object>
-							<object class="NSButton" id="430629007">
-								<reference key="NSNextResponder" ref="46287572"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{15, 13}, {96, 28}}</string>
-								<reference key="NSSuperview" ref="46287572"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="562929863">
-									<int key="NSCellFlags">67239424</int>
-									<int key="NSCellFlags2">134348800</int>
-									<string key="NSContents">^IDS_BOOMARK_BUBBLE_OPTIONS</string>
-									<reference key="NSSupport" ref="26"/>
-									<reference key="NSControlView" ref="430629007"/>
-									<int key="NSButtonFlags">-2038284033</int>
-									<int key="NSButtonFlags2">129</int>
-									<string key="NSAlternateContents"/>
-									<string key="NSKeyEquivalent"/>
-									<int key="NSPeriodicDelay">200</int>
-									<int key="NSPeriodicInterval">25</int>
-								</object>
-							</object>
-						</object>
-						<string key="NSFrame">{{152, 0}, {222, 42}}</string>
-						<reference key="NSSuperview" ref="1005"/>
-						<string key="NSClassName">GTMWidthBasedTweaker</string>
-					</object>
-					<object class="NSCustomView" id="209382123">
-						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">292</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSButton" id="177936093">
-								<reference key="NSNextResponder" ref="209382123"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{15, 13}, {96, 28}}</string>
-								<reference key="NSSuperview" ref="209382123"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSButtonCell" key="NSCell" id="1066753170">
-									<int key="NSCellFlags">-2080244224</int>
-									<int key="NSCellFlags2">134348800</int>
-									<string key="NSContents">^IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK</string>
-									<reference key="NSSupport" ref="26"/>
-									<reference key="NSControlView" ref="177936093"/>
-									<int key="NSButtonFlags">-2038021889</int>
-									<int key="NSButtonFlags2">129</int>
-									<object class="NSFont" key="NSAlternateImage">
-										<string key="NSName">LucidaGrande</string>
-										<double key="NSSize">1.100000e+01</double>
-										<int key="NSfFlags">16</int>
+								<object class="NSCustomView" id="46287572">
+									<reference key="NSNextResponder" ref="1005"/>
+									<int key="NSvFlags">289</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSButton" id="82356437">
+											<reference key="NSNextResponder" ref="46287572"/>
+											<int key="NSvFlags">289</int>
+											<string key="NSFrame">{{111, 13}, {96, 28}}</string>
+											<reference key="NSSuperview" ref="46287572"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="307931553">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">134348800</int>
+												<string key="NSContents">^IDS_CLOSE</string>
+												<object class="NSFont" key="NSSupport" id="26">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">1.100000e+01</double>
+													<int key="NSfFlags">3100</int>
+												</object>
+												<reference key="NSControlView" ref="82356437"/>
+												<int key="NSButtonFlags">-2038284033</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
+										<object class="NSButton" id="430629007">
+											<reference key="NSNextResponder" ref="46287572"/>
+											<int key="NSvFlags">289</int>
+											<string key="NSFrame">{{15, 13}, {96, 28}}</string>
+											<reference key="NSSuperview" ref="46287572"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="562929863">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">134348800</int>
+												<string key="NSContents">^IDS_BOOMARK_BUBBLE_OPTIONS</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="430629007"/>
+												<int key="NSButtonFlags">-2038284033</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
 									</object>
-									<string key="NSAlternateContents"/>
-									<string key="NSKeyEquivalent"/>
-									<int key="NSPeriodicDelay">400</int>
-									<int key="NSPeriodicInterval">75</int>
-								</object>
-							</object>
-						</object>
-						<string key="NSFrameSize">{126, 42}</string>
-						<reference key="NSSuperview" ref="1005"/>
-						<string key="NSClassName">GTMWidthBasedTweaker</string>
-					</object>
-					<object class="NSCustomView" id="900754038">
-						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">268</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSTextField" id="303910295">
-								<reference key="NSNextResponder" ref="900754038"/>
-								<int key="NSvFlags">265</int>
-								<string key="NSFrame">{{17, 31}, {65, 14}}</string>
-								<reference key="NSSuperview" ref="900754038"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSTextFieldCell" key="NSCell" id="628112279">
-									<int key="NSCellFlags">68288064</int>
-									<int key="NSCellFlags2">272761856</int>
-									<string key="NSContents">^IDS_BOOMARK_BUBBLE_TITLE_TEXT</string>
-									<reference key="NSSupport" ref="26"/>
-									<reference key="NSControlView" ref="303910295"/>
-									<reference key="NSBackgroundColor" ref="152587692"/>
-									<reference key="NSTextColor" ref="1000275559"/>
-								</object>
-							</object>
-							<object class="NSTextField" id="228609717">
-								<reference key="NSNextResponder" ref="900754038"/>
-								<int key="NSvFlags">265</int>
-								<string key="NSFrame">{{17, 6}, {65, 14}}</string>
-								<reference key="NSSuperview" ref="900754038"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSTextFieldCell" key="NSCell" id="295393049">
-									<int key="NSCellFlags">68288064</int>
-									<int key="NSCellFlags2">272761856</int>
-									<string key="NSContents">^IDS_BOOMARK_BUBBLE_FOLDER_TEXT</string>
-									<reference key="NSSupport" ref="26"/>
-									<reference key="NSControlView" ref="228609717"/>
-									<reference key="NSBackgroundColor" ref="152587692"/>
-									<reference key="NSTextColor" ref="1000275559"/>
+									<string key="NSFrame">{{152, 0}, {222, 42}}</string>
+									<reference key="NSSuperview" ref="1005"/>
+									<string key="NSClassName">GTMWidthBasedTweaker</string>
 								</object>
-							</object>
-						</object>
-						<string key="NSFrame">{{0, 50}, {84, 53}}</string>
-						<reference key="NSSuperview" ref="1005"/>
-						<string key="NSClassName">GTMWidthBasedTweaker</string>
-					</object>
-					<object class="NSBox" id="899552678">
-						<reference key="NSNextResponder" ref="1005"/>
-						<int key="NSvFlags">10</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSView" id="583964310">
-								<reference key="NSNextResponder" ref="899552678"/>
-								<int key="NSvFlags">256</int>
-								<object class="NSMutableArray" key="NSSubviews">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSTextField" id="39428350">
-										<reference key="NSNextResponder" ref="583964310"/>
-										<int key="NSvFlags">266</int>
-										<string key="NSFrame">{{8, 33}, {267, 19}}</string>
-										<reference key="NSSuperview" ref="583964310"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="NSTextFieldCell" key="NSCell" id="905670292">
-											<int key="NSCellFlags">-1804468671</int>
-											<int key="NSCellFlags2">272761856</int>
-											<string key="NSContents"/>
-											<reference key="NSSupport" ref="26"/>
-											<reference key="NSControlView" ref="39428350"/>
-											<bool key="NSDrawsBackground">YES</bool>
-											<object class="NSColor" key="NSBackgroundColor" id="1033293763">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">textBackgroundColor</string>
-												<object class="NSColor" key="NSColor" id="660986653">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MQA</bytes>
+								<object class="NSCustomView" id="209382123">
+									<reference key="NSNextResponder" ref="1005"/>
+									<int key="NSvFlags">292</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSButton" id="177936093">
+											<reference key="NSNextResponder" ref="209382123"/>
+											<int key="NSvFlags">292</int>
+											<string key="NSFrame">{{15, 13}, {96, 28}}</string>
+											<reference key="NSSuperview" ref="209382123"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="1066753170">
+												<int key="NSCellFlags">-2080244224</int>
+												<int key="NSCellFlags2">134348800</int>
+												<string key="NSContents">^IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="177936093"/>
+												<int key="NSButtonFlags">-2038021889</int>
+												<int key="NSButtonFlags2">129</int>
+												<object class="NSFont" key="NSAlternateImage">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">1.100000e+01</double>
+													<int key="NSfFlags">16</int>
 												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
 											</object>
-											<object class="NSColor" key="NSTextColor">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">textColor</string>
-												<reference key="NSColor" ref="947148753"/>
+										</object>
+									</object>
+									<string key="NSFrameSize">{126, 42}</string>
+									<reference key="NSSuperview" ref="1005"/>
+									<string key="NSClassName">GTMWidthBasedTweaker</string>
+								</object>
+								<object class="NSCustomView" id="900754038">
+									<reference key="NSNextResponder" ref="1005"/>
+									<int key="NSvFlags">268</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSTextField" id="303910295">
+											<reference key="NSNextResponder" ref="900754038"/>
+											<int key="NSvFlags">265</int>
+											<string key="NSFrame">{{17, 31}, {65, 14}}</string>
+											<reference key="NSSuperview" ref="900754038"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="628112279">
+												<int key="NSCellFlags">68288064</int>
+												<int key="NSCellFlags2">272761856</int>
+												<string key="NSContents">^IDS_BOOMARK_BUBBLE_TITLE_TEXT</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="303910295"/>
+												<reference key="NSBackgroundColor" ref="152587692"/>
+												<reference key="NSTextColor" ref="1000275559"/>
+											</object>
+										</object>
+										<object class="NSTextField" id="228609717">
+											<reference key="NSNextResponder" ref="900754038"/>
+											<int key="NSvFlags">265</int>
+											<string key="NSFrame">{{17, 6}, {65, 14}}</string>
+											<reference key="NSSuperview" ref="900754038"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="295393049">
+												<int key="NSCellFlags">68288064</int>
+												<int key="NSCellFlags2">272761856</int>
+												<string key="NSContents">^IDS_BOOMARK_BUBBLE_FOLDER_TEXT</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="228609717"/>
+												<reference key="NSBackgroundColor" ref="152587692"/>
+												<reference key="NSTextColor" ref="1000275559"/>
 											</object>
 										</object>
 									</object>
-									<object class="NSComboBox" id="977232728">
-										<reference key="NSNextResponder" ref="583964310"/>
-										<int key="NSvFlags">266</int>
-										<string key="NSFrame">{{8, 5}, {270, 22}}</string>
-										<reference key="NSSuperview" ref="583964310"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="NSComboBoxCell" key="NSCell" id="1003570867">
-											<int key="NSCellFlags">74579521</int>
-											<int key="NSCellFlags2">272761856</int>
-											<string key="NSContents"/>
-											<reference key="NSSupport" ref="26"/>
-											<reference key="NSControlView" ref="977232728"/>
-											<bool key="NSDrawsBackground">YES</bool>
-											<reference key="NSBackgroundColor" ref="1033293763"/>
-											<reference key="NSTextColor" ref="1000275559"/>
-											<int key="NSVisibleItemCount">5</int>
-											<bool key="NSHasVerticalScroller">YES</bool>
-											<reference key="NSDelegate" ref="977232728"/>
-											<object class="NSComboTableView" key="NSTableView" id="1071628594">
-												<reference key="NSNextResponder"/>
-												<int key="NSvFlags">274</int>
-												<string key="NSFrameSize">{15, 0}</string>
-												<reference key="NSSuperview"/>
-												<reference key="NSWindow"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSMutableArray" key="NSTableColumns">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSTableColumn">
-														<integer value="0" key="NSIdentifier"/>
-														<double key="NSWidth">1.200000e+01</double>
-														<double key="NSMinWidth">1.000000e+01</double>
-														<double key="NSMaxWidth">1.000000e+03</double>
-														<object class="NSTableHeaderCell" key="NSHeaderCell">
-															<int key="NSCellFlags">75628032</int>
-															<int key="NSCellFlags2">0</int>
-															<string key="NSContents"/>
-															<object class="NSFont" key="NSSupport">
-																<string key="NSName">LucidaGrande</string>
-																<double key="NSSize">1.200000e+01</double>
-																<int key="NSfFlags">16</int>
-															</object>
-															<object class="NSColor" key="NSBackgroundColor">
+									<string key="NSFrame">{{0, 50}, {84, 53}}</string>
+									<reference key="NSSuperview" ref="1005"/>
+									<string key="NSClassName">GTMWidthBasedTweaker</string>
+								</object>
+								<object class="NSBox" id="899552678">
+									<reference key="NSNextResponder" ref="1005"/>
+									<int key="NSvFlags">10</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSView" id="583964310">
+											<reference key="NSNextResponder" ref="899552678"/>
+											<int key="NSvFlags">256</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSTextField" id="39428350">
+													<reference key="NSNextResponder" ref="583964310"/>
+													<int key="NSvFlags">266</int>
+													<string key="NSFrame">{{8, 33}, {267, 19}}</string>
+													<reference key="NSSuperview" ref="583964310"/>
+													<bool key="NSEnabled">YES</bool>
+													<object class="NSTextFieldCell" key="NSCell" id="905670292">
+														<int key="NSCellFlags">-1804468671</int>
+														<int key="NSCellFlags2">272761856</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="39428350"/>
+														<bool key="NSDrawsBackground">YES</bool>
+														<object class="NSColor" key="NSBackgroundColor" id="1033293763">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">textBackgroundColor</string>
+															<object class="NSColor" key="NSColor" id="660986653">
 																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+																<bytes key="NSWhite">MQA</bytes>
 															</object>
-															<reference key="NSTextColor" ref="660986653"/>
 														</object>
-														<object class="NSTextFieldCell" key="NSDataCell">
-															<int key="NSCellFlags">338820672</int>
-															<int key="NSCellFlags2">1024</int>
-															<reference key="NSSupport" ref="26"/>
-															<reference key="NSControlView" ref="1071628594"/>
-															<bool key="NSDrawsBackground">YES</bool>
-															<object class="NSColor" key="NSBackgroundColor" id="744868739">
+														<object class="NSColor" key="NSTextColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">textColor</string>
+															<reference key="NSColor" ref="947148753"/>
+														</object>
+													</object>
+												</object>
+												<object class="NSComboBox" id="977232728">
+													<reference key="NSNextResponder" ref="583964310"/>
+													<int key="NSvFlags">266</int>
+													<string key="NSFrame">{{8, 5}, {270, 22}}</string>
+													<reference key="NSSuperview" ref="583964310"/>
+													<bool key="NSEnabled">YES</bool>
+													<object class="NSComboBoxCell" key="NSCell" id="1003570867">
+														<int key="NSCellFlags">74579521</int>
+														<int key="NSCellFlags2">272761856</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="977232728"/>
+														<bool key="NSDrawsBackground">YES</bool>
+														<reference key="NSBackgroundColor" ref="1033293763"/>
+														<reference key="NSTextColor" ref="1000275559"/>
+														<int key="NSVisibleItemCount">5</int>
+														<bool key="NSHasVerticalScroller">YES</bool>
+														<reference key="NSDelegate" ref="977232728"/>
+														<object class="NSComboTableView" key="NSTableView" id="1071628594">
+															<reference key="NSNextResponder"/>
+															<int key="NSvFlags">274</int>
+															<string key="NSFrameSize">{15, 0}</string>
+															<reference key="NSSuperview"/>
+															<reference key="NSWindow"/>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSMutableArray" key="NSTableColumns">
+																<bool key="EncodedWithXMLCoder">YES</bool>
+																<object class="NSTableColumn">
+																	<integer value="0" key="NSIdentifier"/>
+																	<double key="NSWidth">1.200000e+01</double>
+																	<double key="NSMinWidth">1.000000e+01</double>
+																	<double key="NSMaxWidth">1.000000e+03</double>
+																	<object class="NSTableHeaderCell" key="NSHeaderCell">
+																		<int key="NSCellFlags">75628032</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents"/>
+																		<object class="NSFont" key="NSSupport">
+																			<string key="NSName">LucidaGrande</string>
+																			<double key="NSSize">1.200000e+01</double>
+																			<int key="NSfFlags">16</int>
+																		</object>
+																		<object class="NSColor" key="NSBackgroundColor">
+																			<int key="NSColorSpace">3</int>
+																			<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+																		</object>
+																		<reference key="NSTextColor" ref="660986653"/>
+																	</object>
+																	<object class="NSTextFieldCell" key="NSDataCell">
+																		<int key="NSCellFlags">338820672</int>
+																		<int key="NSCellFlags2">1024</int>
+																		<reference key="NSSupport" ref="26"/>
+																		<reference key="NSControlView" ref="1071628594"/>
+																		<bool key="NSDrawsBackground">YES</bool>
+																		<object class="NSColor" key="NSBackgroundColor" id="744868739">
+																			<int key="NSColorSpace">6</int>
+																			<string key="NSCatalogName">System</string>
+																			<string key="NSColorName">controlBackgroundColor</string>
+																			<reference key="NSColor" ref="748407352"/>
+																		</object>
+																		<reference key="NSTextColor" ref="1000275559"/>
+																	</object>
+																	<int key="NSResizingMask">3</int>
+																	<bool key="NSIsResizeable">YES</bool>
+																	<reference key="NSTableView" ref="1071628594"/>
+																</object>
+															</object>
+															<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+															<double key="NSIntercellSpacingHeight">2.000000e+00</double>
+															<reference key="NSBackgroundColor" ref="744868739"/>
+															<object class="NSColor" key="NSGridColor">
 																<int key="NSColorSpace">6</int>
 																<string key="NSCatalogName">System</string>
-																<string key="NSColorName">controlBackgroundColor</string>
-																<reference key="NSColor" ref="748407352"/>
+																<string key="NSColorName">gridColor</string>
+																<object class="NSColor" key="NSColor">
+																	<int key="NSColorSpace">3</int>
+																	<bytes key="NSWhite">MC41AA</bytes>
+																</object>
 															</object>
-															<reference key="NSTextColor" ref="1000275559"/>
+															<double key="NSRowHeight">1.600000e+01</double>
+															<string key="NSAction">tableViewAction:</string>
+															<int key="NSTvFlags">-767524864</int>
+															<reference key="NSDelegate" ref="1003570867"/>
+															<reference key="NSDataSource" ref="1003570867"/>
+															<reference key="NSTarget" ref="1003570867"/>
+															<int key="NSColumnAutoresizingStyle">1</int>
+															<int key="NSDraggingSourceMaskForLocal">15</int>
+															<int key="NSDraggingSourceMaskForNonLocal">0</int>
+															<bool key="NSAllowsTypeSelect">YES</bool>
 														</object>
-														<int key="NSResizingMask">3</int>
-														<bool key="NSIsResizeable">YES</bool>
-														<reference key="NSTableView" ref="1071628594"/>
 													</object>
 												</object>
-												<double key="NSIntercellSpacingWidth">3.000000e+00</double>
-												<double key="NSIntercellSpacingHeight">2.000000e+00</double>
-												<reference key="NSBackgroundColor" ref="744868739"/>
-												<object class="NSColor" key="NSGridColor">
-													<int key="NSColorSpace">6</int>
-													<string key="NSCatalogName">System</string>
-													<string key="NSColorName">gridColor</string>
-													<object class="NSColor" key="NSColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC41AA</bytes>
-													</object>
-												</object>
-												<double key="NSRowHeight">1.600000e+01</double>
-												<string key="NSAction">tableViewAction:</string>
-												<int key="NSTvFlags">-767524864</int>
-												<reference key="NSDelegate" ref="1003570867"/>
-												<reference key="NSDataSource" ref="1003570867"/>
-												<reference key="NSTarget" ref="1003570867"/>
-												<int key="NSColumnAutoresizingStyle">1</int>
-												<int key="NSDraggingSourceMaskForLocal">15</int>
-												<int key="NSDraggingSourceMaskForNonLocal">0</int>
-												<bool key="NSAllowsTypeSelect">YES</bool>
 											</object>
+											<string key="NSFrameSize">{294, 59}</string>
+											<reference key="NSSuperview" ref="899552678"/>
 										</object>
 									</object>
+									<string key="NSFrame">{{79, 46}, {294, 59}}</string>
+									<reference key="NSSuperview" ref="1005"/>
+									<string key="NSOffsets">{0, 0}</string>
+									<object class="NSTextFieldCell" key="NSTitleCell">
+										<int key="NSCellFlags">67239424</int>
+										<int key="NSCellFlags2">0</int>
+										<string key="NSContents"/>
+										<reference key="NSSupport" ref="26"/>
+										<reference key="NSBackgroundColor" ref="1033293763"/>
+										<object class="NSColor" key="NSTextColor">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+										</object>
+									</object>
+									<reference key="NSContentView" ref="583964310"/>
+									<int key="NSBorderType">0</int>
+									<int key="NSBoxType">0</int>
+									<int key="NSTitlePosition">0</int>
+									<bool key="NSTransparent">NO</bool>
 								</object>
-								<string key="NSFrameSize">{294, 59}</string>
-								<reference key="NSSuperview" ref="899552678"/>
 							</object>
+							<string key="NSFrameSize">{374, 145}</string>
+							<reference key="NSSuperview" ref="45997296"/>
+							<string key="NSClassName">BookmarkBubbleView</string>
 						</object>
-						<string key="NSFrame">{{79, 46}, {294, 59}}</string>
-						<reference key="NSSuperview" ref="1005"/>
-						<string key="NSOffsets">{0, 0}</string>
-						<object class="NSTextFieldCell" key="NSTitleCell">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">0</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSBackgroundColor" ref="1033293763"/>
-							<object class="NSColor" key="NSTextColor">
-								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-							</object>
-						</object>
-						<reference key="NSContentView" ref="583964310"/>
-						<int key="NSBorderType">0</int>
-						<int key="NSBoxType">0</int>
-						<int key="NSTitlePosition">0</int>
-						<bool key="NSTransparent">NO</bool>
 					</object>
+					<string key="NSFrameSize">{374, 145}</string>
+					<reference key="NSSuperview"/>
 				</object>
-				<string key="NSFrameSize">{374, 145}</string>
-				<reference key="NSSuperview"/>
-				<string key="NSClassName">BookmarkBubbleView</string>
-			</object>
-			<object class="NSCustomObject" id="704223344">
-				<string key="NSClassName">ChromeUILocalizer</string>
-			</object>
-			<object class="NSCustomObject" id="279326944">
-				<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -402,14 +423,6 @@
 					<int key="connectionID">25</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">close:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="82356437"/>
-					</object>
-					<int key="connectionID">26</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">bigTitle_</string>
 						<reference key="source" ref="1001"/>
@@ -427,14 +440,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">30</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">folderComboBox_</string>
 						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="977232728"/>
@@ -473,6 +478,38 @@
 					</object>
 					<int key="connectionID">44</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="588083889"/>
+					</object>
+					<int key="connectionID">52</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="588083889"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">53</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="588083889"/>
+						<reference key="destination" ref="39428350"/>
+					</object>
+					<int key="connectionID">54</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="82356437"/>
+					</object>
+					<int key="connectionID">56</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -504,6 +541,34 @@
 						<string key="objectName">Application</string>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="704223344"/>
+						<reference key="parent" ref="376579351"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">42</int>
+						<reference key="object" ref="279326944"/>
+						<reference key="parent" ref="376579351"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">50</int>
+						<reference key="object" ref="588083889"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="45997296"/>
+						</object>
+						<reference key="parent" ref="376579351"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">51</int>
+						<reference key="object" ref="45997296"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1005"/>
+						</object>
+						<reference key="parent" ref="588083889"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">1</int>
 						<reference key="object" ref="1005"/>
 						<object class="NSMutableArray" key="children">
@@ -514,7 +579,7 @@
 							<reference ref="900754038"/>
 							<reference ref="899552678"/>
 						</object>
-						<reference key="parent" ref="376579351"/>
+						<reference key="parent" ref="45997296"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2</int>
@@ -526,16 +591,6 @@
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="368795405"/>
-						<reference key="parent" ref="559397096"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">31</int>
-						<reference key="object" ref="704223344"/>
-						<reference key="parent" ref="376579351"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">34</int>
 						<reference key="object" ref="46287572"/>
 						<object class="NSMutableArray" key="children">
@@ -546,65 +601,61 @@
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="82356437"/>
+						<int key="objectID">35</int>
+						<reference key="object" ref="209382123"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="307931553"/>
+							<reference ref="177936093"/>
 						</object>
-						<reference key="parent" ref="46287572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="307931553"/>
-						<reference key="parent" ref="82356437"/>
+						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="430629007"/>
+						<int key="objectID">36</int>
+						<reference key="object" ref="900754038"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="562929863"/>
+							<reference ref="303910295"/>
+							<reference ref="228609717"/>
 						</object>
-						<reference key="parent" ref="46287572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="562929863"/>
-						<reference key="parent" ref="430629007"/>
+						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">35</int>
-						<reference key="object" ref="209382123"/>
+						<int key="objectID">39</int>
+						<reference key="object" ref="899552678"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="177936093"/>
+							<reference ref="39428350"/>
+							<reference ref="977232728"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="177936093"/>
+						<int key="objectID">12</int>
+						<reference key="object" ref="39428350"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1066753170"/>
+							<reference ref="905670292"/>
 						</object>
-						<reference key="parent" ref="209382123"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="1066753170"/>
-						<reference key="parent" ref="177936093"/>
+						<reference key="parent" ref="899552678"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">36</int>
-						<reference key="object" ref="900754038"/>
+						<int key="objectID">14</int>
+						<reference key="object" ref="977232728"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="303910295"/>
-							<reference ref="228609717"/>
+							<reference ref="1003570867"/>
 						</object>
-						<reference key="parent" ref="1005"/>
+						<reference key="parent" ref="899552678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="1003570867"/>
+						<reference key="parent" ref="977232728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="905670292"/>
+						<reference key="parent" ref="39428350"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
@@ -616,11 +667,6 @@
 						<reference key="parent" ref="900754038"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="628112279"/>
-						<reference key="parent" ref="303910295"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">10</int>
 						<reference key="object" ref="228609717"/>
 						<object class="NSMutableArray" key="children">
@@ -635,47 +681,56 @@
 						<reference key="parent" ref="228609717"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="899552678"/>
+						<int key="objectID">9</int>
+						<reference key="object" ref="628112279"/>
+						<reference key="parent" ref="303910295"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="177936093"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="39428350"/>
-							<reference ref="977232728"/>
+							<reference ref="1066753170"/>
 						</object>
-						<reference key="parent" ref="1005"/>
+						<reference key="parent" ref="209382123"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="39428350"/>
+						<int key="objectID">21</int>
+						<reference key="object" ref="1066753170"/>
+						<reference key="parent" ref="177936093"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="82356437"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="905670292"/>
+							<reference ref="307931553"/>
 						</object>
-						<reference key="parent" ref="899552678"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="905670292"/>
-						<reference key="parent" ref="39428350"/>
+						<reference key="parent" ref="46287572"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="977232728"/>
+						<int key="objectID">16</int>
+						<reference key="object" ref="430629007"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1003570867"/>
+							<reference ref="562929863"/>
 						</object>
-						<reference key="parent" ref="899552678"/>
+						<reference key="parent" ref="46287572"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="1003570867"/>
-						<reference key="parent" ref="977232728"/>
+						<int key="objectID">17</int>
+						<reference key="object" ref="562929863"/>
+						<reference key="parent" ref="430629007"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="279326944"/>
-						<reference key="parent" ref="376579351"/>
+						<int key="objectID">19</int>
+						<reference key="object" ref="307931553"/>
+						<reference key="parent" ref="82356437"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="368795405"/>
+						<reference key="parent" ref="559397096"/>
 					</object>
 				</object>
 			</object>
@@ -707,6 +762,11 @@
 					<string>3.IBPluginDependency</string>
 					<string>31.IBPluginDependency</string>
 					<string>42.IBPluginDependency</string>
+					<string>50.IBEditorWindowLastContentRect</string>
+					<string>50.IBPluginDependency</string>
+					<string>50.IBWindowTemplateEditedContentRect</string>
+					<string>50.NSWindowTemplate.visibleAtLaunch</string>
+					<string>51.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
 				</object>
@@ -715,7 +775,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{407, 412}, {374, 145}}</string>
+					<string>{{126, 412}, {374, 145}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableArray">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -743,6 +803,11 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{241, 633}, {374, 145}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{241, 633}, {374, 145}}</string>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
@@ -767,20 +832,21 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">44</int>
+			<int key="maxID">56</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">BookmarkBubbleController</string>
-					<string key="superclassName">NSViewController</string>
+					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>close:</string>
+							<string>cancel:</string>
 							<string>edit:</string>
+							<string>ok:</string>
 							<string>remove:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -788,6 +854,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -821,6 +888,14 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">BookmarkBubbleWindow</string>
+					<string key="superclassName">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/bookmark_bubble_window.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">ChromeUILocalizer</string>
 					<string key="superclassName">GTMUILocalizer</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -908,6 +983,13 @@
 						<string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/nswindow_local_state.h</string>
+					</object>
+				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>