Nice looking First-Run dialogs.

* Switch NIB.
* Use NSWindowController.
* "Make default browser" button hooked up.
* Import bookmarks still not implemented.

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

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

4 files changed, 712 insertions, 383 deletions

diff --git a/chrome/app/nibs/FirstRunDialog.xib b/chrome/app/nibs/FirstRunDialog.xib
index 4c127a7..0ef319c 100644
--- a/chrome/app/nibs/FirstRunDialog.xib
+++ b/chrome/app/nibs/FirstRunDialog.xib
@@ -37,9 +37,9 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {507, 270}}</string>
-				<int key="NSWTFlags">1610613760</int>
-				<string key="NSWindowTitle">Welcome to Google Chrome for Mac OS X</string>
+				<string key="NSWindowRect">{{196, 215}, {480, 295}}</string>
+				<int key="NSWTFlags">536871936</int>
+				<string key="NSWindowTitle">Welcome to Google Chrome</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -48,67 +48,65 @@
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="502236431">
+						<object class="NSTextField" id="772316250">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 131}, {483, 119}}</string>
+							<string key="NSFrame">{{63, 93}, {372, 39}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1018548691">
+							<object class="NSTextFieldCell" key="NSCell" id="180945224">
 								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">1346371584</int>
-								<string type="base64-UTF8" key="NSContents">V2VsY29tZSB0byBHb29nbGUgQ2hyb21lIGZvciBNYWMgT1MgWCAtIERldmVsb3BlciBSZWxlYXNlIE9u
-bHkKClRoaXMgcmVsZWFzZSBpcyBub3QgYXBwcm9wcmlhdGUgZm9yIGdlbmVyYWwgY29uc3VtZXIgdXNl
-LiBTZXZlcmFsIGZlYXR1cmVzLCBzdWNoIGFzIGJvb2ttYXJrIGFuZCBwYXNzd29yZCBpbXBvcnQgYW5k
-IGNlcnRhaW4gcHJpdmFjeSBmZWF0dXJlcywgYXJlIHVuYXZhaWxhYmxlIGF0IHRoaXMgdGltZS4gIFBs
-ZWFzZSBzZWUgb3VyIHByaXZhY3kgcG9saWN5IGZvciBmdXJ0aGVyIGRldGFpbHMgOiBodHRwOi8vd3d3
-Lmdvb2dsZS5jb20vY2hyb21lL2ludGwvZW4vcHJpdmFjeV9tYWMuaHRtbCAuICBZb3VyIGRlZmF1bHQg
-YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
-								<object class="NSFont" key="NSSupport" id="832514646">
+								<int key="NSCellFlags2">272629760</int>
+								<string key="NSContents">Help make Google Chrome better by automatically sending usage statistics and crash reports to Google</string>
+								<object class="NSFont" key="NSSupport">
 									<string key="NSName">LucidaGrande</string>
 									<double key="NSSize">1.300000e+01</double>
-									<int key="NSfFlags">1044</int>
+									<int key="NSfFlags">16</int>
 								</object>
-								<reference key="NSControlView" ref="502236431"/>
-								<object class="NSColor" key="NSBackgroundColor">
+								<reference key="NSControlView" ref="772316250"/>
+								<object class="NSColor" key="NSBackgroundColor" id="756607450">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor" id="463577634">
+									<object class="NSColor" key="NSColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
 									</object>
 								</object>
-								<object class="NSColor" key="NSTextColor">
+								<object class="NSColor" key="NSTextColor" id="791758296">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor" id="375704399">
+									<object class="NSColor" key="NSColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MAA</bytes>
 									</object>
 								</object>
 							</object>
 						</object>
-						<object class="NSButton" id="949645676">
+						<object class="NSButton" id="328877840">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{18, 86}, {22, 25}}</string>
+							<string key="NSFrame">{{45, 139}, {235, 18}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="135453653">
-								<int key="NSCellFlags">-2080244224</int>
+							<object class="NSButtonCell" key="NSCell" id="1019469145">
+								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">0</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="832514646"/>
-								<reference key="NSControlView" ref="949645676"/>
+								<string key="NSContents">Make Chrome my default browser</string>
+								<object class="NSFont" key="NSSupport" id="605141190">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">1.300000e+01</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="328877840"/>
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">130</int>
-								<object class="NSCustomResource" key="NSNormalImage">
+								<object class="NSCustomResource" key="NSNormalImage" id="229715940">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">NSSwitch</string>
 								</object>
-								<object class="NSButtonImageSource" key="NSAlternateImage">
+								<object class="NSButtonImageSource" key="NSAlternateImage" id="410915626">
 									<string key="NSImageName">NSSwitch</string>
 								</object>
 								<string key="NSAlternateContents"/>
@@ -117,276 +115,332 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSButton" id="585627708">
+						<object class="NSButton" id="690083374">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{201, 12}, {96, 32}}</string>
+							<string key="NSFrame">{{45, 166}, {174, 18}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="515660988">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">OK</string>
-								<reference key="NSSupport" ref="832514646"/>
-								<reference key="NSControlView" ref="585627708"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">129</int>
+							<object class="NSButtonCell" key="NSCell" id="567450486">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Import bookmarks from</string>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSControlView" ref="690083374"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">130</int>
+								<reference key="NSNormalImage" ref="229715940"/>
+								<reference key="NSAlternateImage" ref="410915626"/>
 								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<string key="NSKeyEquivalent"/>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSScrollView" id="899181073">
+						<object class="NSPopUpButton" id="21765562">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{222, 161}, {113, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="983528702">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSControlView" ref="21765562"/>
+								<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="737825762">
+									<reference key="NSMenu" ref="799908898"/>
+									<string key="NSTitle">Safari</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="719677793">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuCheckmark</string>
+									</object>
+									<object class="NSCustomResource" key="NSMixedImage" id="429918744">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuMixedState</string>
+									</object>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="983528702"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="799908898">
+									<string key="NSTitle">OtherViews</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="737825762"/>
+										<object class="NSMenuItem" id="949625737">
+											<reference key="NSMenu" ref="799908898"/>
+											<string key="NSTitle">Firefox</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="719677793"/>
+											<reference key="NSMixedImage" ref="429918744"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="983528702"/>
+										</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 class="NSBox" id="728826967">
 							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">256</int>
+							<int key="NSvFlags">12</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSClipView" id="193016761">
-									<reference key="NSNextResponder" ref="899181073"/>
-									<int key="NSvFlags">2304</int>
+								<object class="NSView" id="892364686">
+									<reference key="NSNextResponder" ref="728826967"/>
+									<int key="NSvFlags">256</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSTextView" id="421721722">
-											<reference key="NSNextResponder" ref="193016761"/>
-											<int key="NSvFlags">2322</int>
-											<string key="NSFrameSize">{433, 31}</string>
-											<reference key="NSSuperview" ref="193016761"/>
-											<object class="NSTextContainer" key="NSTextContainer" id="465558439">
-												<object class="NSLayoutManager" key="NSLayoutManager">
-													<object class="NSTextStorage" key="NSTextStorage">
-														<object class="NSMutableString" key="NSString">
-															<characters key="NS.bytes">Optional:  Help make Google Chrome better by automatically sending usage statistics and crash reports to Google. Learn more</characters>
-														</object>
-														<object class="NSMutableArray" key="NSAttributes">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSDictionary">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSMutableArray" key="dict.sortedKeys">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<string>NSFont</string>
-																	<string>NSParagraphStyle</string>
-																</object>
-																<object class="NSMutableArray" key="dict.values">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSFont">
-																		<string key="NSName">LucidaGrande-Bold</string>
-																		<double key="NSSize">1.300000e+01</double>
-																		<int key="NSfFlags">16</int>
-																	</object>
-																	<object class="NSParagraphStyle" id="755641935">
-																		<int key="NSAlignment">4</int>
-																		<object class="NSArray" key="NSTabStops">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<object class="NSTextTab" id="1070966546">
-																				<double key="NSLocation">3.600000e+01</double>
-																			</object>
-																			<object class="NSTextTab" id="211679900">
-																				<double key="NSLocation">7.200000e+01</double>
-																			</object>
-																			<object class="NSTextTab" id="144751252">
-																				<double key="NSLocation">1.080000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="68538921">
-																				<double key="NSLocation">1.440000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="619543405">
-																				<double key="NSLocation">1.800000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="558567972">
-																				<double key="NSLocation">2.160000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="162838443">
-																				<double key="NSLocation">2.520000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="222845524">
-																				<double key="NSLocation">2.880000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="488780994">
-																				<double key="NSLocation">3.240000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="509357653">
-																				<double key="NSLocation">3.600000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="124538056">
-																				<double key="NSLocation">3.960000e+02</double>
-																			</object>
-																			<object class="NSTextTab" id="516925898">
-																				<double key="NSLocation">4.320000e+02</double>
-																			</object>
-																		</object>
-																	</object>
-																</object>
-															</object>
-															<object class="NSDictionary">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSMutableArray" key="dict.sortedKeys">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<string>NSFont</string>
-																	<string>NSParagraphStyle</string>
-																</object>
-																<object class="NSMutableArray" key="dict.values">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSFont" id="564347508">
-																		<string key="NSName">LucidaGrande</string>
-																		<double key="NSSize">1.300000e+01</double>
-																		<int key="NSfFlags">16</int>
-																	</object>
-																	<reference ref="755641935"/>
-																</object>
-															</object>
-															<object class="NSDictionary">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSMutableArray" key="dict.sortedKeys">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<string>NSFont</string>
-																	<string>NSLink</string>
-																	<string>NSParagraphStyle</string>
-																</object>
-																<object class="NSMutableArray" key="dict.values">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<reference ref="564347508"/>
-																	<object class="NSURL">
-																		<nil key="NS.base"/>
-																		<string key="NS.relative">http://www.google.com/support/chrome/go/mac_usage_stats</string>
-																	</object>
-																	<object class="NSParagraphStyle">
-																		<int key="NSAlignment">4</int>
-																		<object class="NSArray" key="NSTabStops">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="1070966546"/>
-																			<reference ref="211679900"/>
-																			<reference ref="144751252"/>
-																			<reference ref="68538921"/>
-																			<reference ref="619543405"/>
-																			<reference ref="558567972"/>
-																			<reference ref="162838443"/>
-																			<reference ref="222845524"/>
-																			<reference ref="488780994"/>
-																			<reference ref="509357653"/>
-																			<reference ref="124538056"/>
-																			<reference ref="516925898"/>
-																		</object>
-																	</object>
-																</object>
-															</object>
-														</object>
-														<object class="NSMutableData" key="NSAttributeInfo">
-															<bytes key="NS.bytes">CQBoAQoCA</bytes>
-														</object>
-														<nil key="NSDelegate"/>
-													</object>
-													<object class="NSMutableArray" key="NSTextContainers">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<reference ref="465558439"/>
-													</object>
-													<int key="NSLMFlags">6</int>
-													<nil key="NSDelegate"/>
-												</object>
-												<reference key="NSTextView" ref="421721722"/>
-												<double key="NSWidth">4.330000e+02</double>
-												<int key="NSTCFlags">1</int>
+										<object class="NSTextField" id="80642245">
+											<reference key="NSNextResponder" ref="892364686"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{13, 25}, {342, 17}}</string>
+											<reference key="NSSuperview" ref="892364686"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="737321925">
+												<int key="NSCellFlags">68288064</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Google Chrome is ready to complete your installation</string>
+												<reference key="NSSupport" ref="605141190"/>
+												<reference key="NSControlView" ref="80642245"/>
+												<reference key="NSBackgroundColor" ref="756607450"/>
+												<reference key="NSTextColor" ref="791758296"/>
 											</object>
-											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">2053</int>
-												<object class="NSColor" key="NSBackgroundColor">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MSAwAA</bytes>
-												</object>
-												<reference key="NSInsertionColor" ref="375704399"/>
-												<object class="NSDictionary" key="NSSelectedAttributes">
+										</object>
+										<object class="NSImageView" id="630302226">
+											<reference key="NSNextResponder" ref="892364686"/>
+											<int key="NSvFlags">256</int>
+											<object class="NSMutableSet" key="NSDragTypes">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSMutableArray" key="set.sortedObjects">
 													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSMutableArray" key="dict.sortedKeys">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<string>NSBackgroundColor</string>
-														<string>NSColor</string>
-													</object>
-													<object class="NSMutableArray" key="dict.values">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">selectedTextBackgroundColor</string>
-															<reference key="NSColor" ref="463577634"/>
-														</object>
-														<object class="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">selectedTextColor</string>
-															<reference key="NSColor" ref="375704399"/>
-														</object>
-													</object>
+													<string>Apple PDF pasteboard type</string>
+													<string>Apple PICT pasteboard type</string>
+													<string>Apple PNG pasteboard type</string>
+													<string>NSFilenamesPboardType</string>
+													<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+													<string>NeXT TIFF v4.0 pasteboard type</string>
 												</object>
-												<nil key="NSMarkedAttributes"/>
-												<object class="NSDictionary" key="NSLinkAttributes">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSMutableArray" key="dict.sortedKeys">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<string>NSColor</string>
-														<string>NSUnderline</string>
-													</object>
-													<object class="NSMutableArray" key="dict.values">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSColor">
-															<int key="NSColorSpace">1</int>
-															<bytes key="NSRGB">MCAwIDEAA</bytes>
-														</object>
-														<integer value="1"/>
-													</object>
+											</object>
+											<string key="NSFrame">{{408, -25}, {96, 96}}</string>
+											<reference key="NSSuperview" ref="892364686"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSImageCell" key="NSCell" id="80479895">
+												<int key="NSCellFlags">130560</int>
+												<int key="NSCellFlags2">33554432</int>
+												<object class="NSCustomResource" key="NSContents">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">NSApplicationIcon</string>
 												</object>
-												<nil key="NSDefaultParagraphStyle"/>
+												<int key="NSAlign">0</int>
+												<int key="NSScale">0</int>
+												<int key="NSStyle">0</int>
+												<bool key="NSAnimates">YES</bool>
 											</object>
-											<int key="NSTVFlags">6</int>
-											<string key="NSMaxSize">{866, 1e+07}</string>
-											<string key="NSMinize">{223, 0}</string>
-											<nil key="NSDelegate"/>
+											<bool key="NSEditable">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrameSize">{433, 50}</string>
-									<reference key="NSSuperview" ref="899181073"/>
-									<reference key="NSNextKeyView" ref="421721722"/>
-									<reference key="NSDocView" ref="421721722"/>
-									<object class="NSColor" key="NSBGColor">
+									<string key="NSFrameSize">{480, 55}</string>
+									<reference key="NSSuperview" ref="728826967"/>
+								</object>
+							</object>
+							<string key="NSFrame">{{0, 244}, {480, 55}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Box</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">1.100000e+01</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<object class="NSColor" key="NSBackgroundColor" id="469450765">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor" id="650844207">
 										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MSAwAA</bytes>
+										<bytes key="NSWhite">MQA</bytes>
 									</object>
-									<object class="NSCursor" key="NSCursor">
-										<string key="NSHotSpot">{4, -5}</string>
-										<int key="NSCursorType">1</int>
-									</object>
-									<int key="NScvFlags">2</int>
 								</object>
-								<object class="NSScroller" id="811607404">
-									<reference key="NSNextResponder" ref="899181073"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{-100, -100}, {15, 133}}</string>
-									<reference key="NSSuperview" ref="899181073"/>
-									<reference key="NSTarget" ref="899181073"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">7.388889e-01</double>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
 								</object>
-								<object class="NSScroller" id="550475465">
-									<reference key="NSNextResponder" ref="899181073"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
-									<reference key="NSSuperview" ref="899181073"/>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="899181073"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1.000000e+00</double>
-									<double key="NSPercent">9.456522e-01</double>
+							</object>
+							<reference key="NSContentView" ref="892364686"/>
+							<int key="NSBorderType">0</int>
+							<int key="NSBoxType">4</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+							<reference key="NSFillColor2" ref="650844207"/>
+						</object>
+						<object class="NSBox" id="990160012">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">12</int>
+							<string key="NSFrame">{{0, 241}, {480, 5}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Box</string>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSBackgroundColor" ref="469450765"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
 								</object>
 							</object>
-							<string key="NSFrame">{{33, 60}, {433, 50}}</string>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">2</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSTextField" id="208570836">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{28, 199}, {228, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSNextKeyView" ref="193016761"/>
-							<int key="NSsFlags">0</int>
-							<reference key="NSVScroller" ref="811607404"/>
-							<reference key="NSHScroller" ref="550475465"/>
-							<reference key="NSContentView" ref="193016761"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="186162046">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Google Chrome will do these tasks:</string>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSControlView" ref="208570836"/>
+								<reference key="NSBackgroundColor" ref="756607450"/>
+								<reference key="NSTextColor" ref="791758296"/>
+							</object>
+						</object>
+						<object class="NSButton" id="287263597">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{198, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1066198765">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSControlView" ref="287263597"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="458129764">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{294, 12}, {172, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="685620085">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Start Google Chrome</string>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSControlView" ref="458129764"/>
+								<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="NSBox" id="5085353">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">12</int>
+							<string key="NSFrame">{{0, 58}, {480, 5}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Box</string>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSBackgroundColor" ref="469450765"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">2</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="533962116">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{45, 109}, {322, 27}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="645476742">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="605141190"/>
+								<reference key="NSControlView" ref="533962116"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">130</int>
+								<reference key="NSNormalImage" ref="229715940"/>
+								<reference key="NSAlternateImage" ref="410915626"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="575991284">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{54, 76}, {86, 19}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="955346791">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Learn more</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">1.200000e+01</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSControlView" ref="575991284"/>
+								<int key="NSButtonFlags">-2046541569</int>
+								<int key="NSButtonFlags2">164</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{507, 270}</string>
+					<string key="NSFrameSize">{480, 295}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -398,47 +452,99 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">initialFirstResponder</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="585627708"/>
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
 					</object>
-					<int key="connectionID">9</int>
+					<int key="connectionID">65</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">CloseDialog:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="585627708"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: importBookmarks</string>
+						<reference key="source" ref="690083374"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="690083374"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: importBookmarks</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">importBookmarks</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">16</int>
+					<int key="connectionID">66</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">first_run_dialog_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedIndex: browserImportSelectedIndex</string>
+						<reference key="source" ref="21765562"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="21765562"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">selectedIndex: browserImportSelectedIndex</string>
+							<string key="NSBinding">selectedIndex</string>
+							<string key="NSKeyPath">browserImportSelectedIndex</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
 					</object>
-					<int key="connectionID">17</int>
+					<int key="connectionID">67</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: stats_enabled_</string>
-						<reference key="source" ref="949645676"/>
+						<string key="label">value: makeDefaultBrowser</string>
+						<reference key="source" ref="328877840"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="949645676"/>
+							<reference key="NSSource" ref="328877840"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: stats_enabled_</string>
+							<string key="NSLabel">value: makeDefaultBrowser</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">stats_enabled_</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
-								<boolean value="NO" key="NS.object.0" id="6"/>
-							</object>
+							<string key="NSKeyPath">makeDefaultBrowser</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">68</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: statsEnabled</string>
+						<reference key="source" ref="533962116"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="533962116"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: statsEnabled</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">statsEnabled</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">22</int>
+					<int key="connectionID">69</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="287263597"/>
+					</object>
+					<int key="connectionID">71</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="458129764"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">learnMore:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="575991284"/>
+					</object>
+					<int key="connectionID">73</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -484,80 +590,218 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 						<reference key="object" ref="1006"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="502236431"/>
-							<reference ref="949645676"/>
-							<reference ref="899181073"/>
-							<reference ref="585627708"/>
+							<reference ref="728826967"/>
+							<reference ref="990160012"/>
+							<reference ref="287263597"/>
+							<reference ref="458129764"/>
+							<reference ref="5085353"/>
+							<reference ref="328877840"/>
+							<reference ref="690083374"/>
+							<reference ref="21765562"/>
+							<reference ref="208570836"/>
+							<reference ref="772316250"/>
+							<reference ref="575991284"/>
+							<reference ref="533962116"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="502236431"/>
+						<int key="objectID">11</int>
+						<reference key="object" ref="328877840"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1018548691"/>
+							<reference ref="1019469145"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="1019469145"/>
+						<reference key="parent" ref="328877840"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="690083374"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="567450486"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="567450486"/>
+						<reference key="parent" ref="690083374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="21765562"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="983528702"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="983528702"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="799908898"/>
+						</object>
+						<reference key="parent" ref="21765562"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="799908898"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="737825762"/>
+							<reference ref="949625737"/>
+						</object>
+						<reference key="parent" ref="983528702"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="737825762"/>
+						<reference key="parent" ref="799908898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="949625737"/>
+						<reference key="parent" ref="799908898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="728826967"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="630302226"/>
+							<reference ref="80642245"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="990160012"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="80642245"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="737321925"/>
+						</object>
+						<reference key="parent" ref="728826967"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">4</int>
-						<reference key="object" ref="1018548691"/>
-						<reference key="parent" ref="502236431"/>
+						<reference key="object" ref="737321925"/>
+						<reference key="parent" ref="80642245"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="630302226"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="80479895"/>
+						</object>
+						<reference key="parent" ref="728826967"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="949645676"/>
+						<int key="objectID">10</int>
+						<reference key="object" ref="80479895"/>
+						<reference key="parent" ref="630302226"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="208570836"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="135453653"/>
+							<reference ref="186162046"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="135453653"/>
-						<reference key="parent" ref="949645676"/>
+						<int key="objectID">24</int>
+						<reference key="object" ref="186162046"/>
+						<reference key="parent" ref="208570836"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="585627708"/>
+						<int key="objectID">25</int>
+						<reference key="object" ref="287263597"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="515660988"/>
+							<reference ref="1066198765"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="515660988"/>
-						<reference key="parent" ref="585627708"/>
+						<int key="objectID">26</int>
+						<reference key="object" ref="1066198765"/>
+						<reference key="parent" ref="287263597"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="458129764"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="685620085"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="685620085"/>
+						<reference key="parent" ref="458129764"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">29</int>
-						<reference key="object" ref="899181073"/>
+						<reference key="object" ref="5085353"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">30</int>
+						<reference key="object" ref="533962116"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="421721722"/>
-							<reference ref="550475465"/>
-							<reference ref="811607404"/>
+							<reference ref="645476742"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="645476742"/>
+						<reference key="parent" ref="533962116"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">32</int>
-						<reference key="object" ref="421721722"/>
-						<reference key="parent" ref="899181073"/>
+						<reference key="object" ref="772316250"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="180945224"/>
+						</object>
+						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">31</int>
-						<reference key="object" ref="550475465"/>
-						<reference key="parent" ref="899181073"/>
+						<int key="objectID">33</int>
+						<reference key="object" ref="180945224"/>
+						<reference key="parent" ref="772316250"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">30</int>
-						<reference key="object" ref="811607404"/>
-						<reference key="parent" ref="899181073"/>
+						<int key="objectID">36</int>
+						<reference key="object" ref="575991284"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="955346791"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">37</int>
+						<reference key="object" ref="955346791"/>
+						<reference key="parent" ref="575991284"/>
 					</object>
 				</object>
 			</object>
@@ -574,27 +818,44 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 					<string>1.NSWindowTemplate.visibleAtLaunch</string>
 					<string>1.WindowOrigin</string>
 					<string>1.editorWindowContentRectSynchronizationRect</string>
+					<string>11.IBPluginDependency</string>
+					<string>12.IBPluginDependency</string>
+					<string>13.IBPluginDependency</string>
+					<string>14.IBPluginDependency</string>
+					<string>15.IBPluginDependency</string>
+					<string>16.IBPluginDependency</string>
+					<string>17.IBEditorWindowLastContentRect</string>
+					<string>17.IBPluginDependency</string>
+					<string>18.IBPluginDependency</string>
+					<string>19.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
+					<string>21.IBPluginDependency</string>
+					<string>22.IBPluginDependency</string>
+					<string>23.IBPluginDependency</string>
+					<string>24.IBPluginDependency</string>
+					<string>25.IBPluginDependency</string>
+					<string>26.IBPluginDependency</string>
+					<string>27.IBPluginDependency</string>
+					<string>28.IBPluginDependency</string>
 					<string>29.IBPluginDependency</string>
 					<string>3.IBPluginDependency</string>
 					<string>30.IBPluginDependency</string>
 					<string>31.IBPluginDependency</string>
 					<string>32.IBPluginDependency</string>
+					<string>33.IBPluginDependency</string>
+					<string>36.IBPluginDependency</string>
+					<string>37.IBPluginDependency</string>
 					<string>4.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>6.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
-					<string>8.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>{{-1478, 664}, {507, 270}}</string>
+					<string>{{638, 518}, {480, 295}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{-1478, 664}, {507, 270}}</string>
-					<reference ref="6"/>
+					<string>{{638, 518}, {480, 295}}</string>
+					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -603,6 +864,23 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{336, 475}, {172, 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>
+					<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>
+					<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>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -630,21 +908,30 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">34</int>
+			<int key="maxID">73</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstRunDialogController</string>
-					<string key="superclassName">NSObject</string>
+					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">CloseDialog:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">first_run_dialog_</string>
-						<string key="NS.object.0">NSWindow</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cancel:</string>
+							<string>learnMore:</string>
+							<string>ok:</string>
+							<string>showWindow:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
@@ -655,13 +942,20 @@ YnJvd3NlciB3aWxsIHJlbWFpbiB0aGUgZGVmYXVsdC4</string>
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/status_bubble_mac.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
 					</object>
 				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../../chrome.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 	</data>
 </archive>
diff --git a/chrome/browser/cocoa/first_run_dialog.h b/chrome/browser/cocoa/first_run_dialog.h
index 6d0f53a..f7f2a11 100644
--- a/chrome/browser/cocoa/first_run_dialog.h
+++ b/chrome/browser/cocoa/first_run_dialog.h
@@ -7,28 +7,33 @@
 
 #import <Cocoa/Cocoa.h>
 
-// Class that acts as a controller for the temporary Modal first run dialog.
+// Class that acts as a controller for the modal first run dialog.
 // The dialog asks the user's explicit permission for reporting stats to help
 // us improve Chromium.
-// This code is temporary and while we'd like to avoid modal dialogs at all
-// costs, it's important to us, even at this early stage in development to
-// to not send any stats back unless the user has explicitly consented.
-// TODO: In the final version of this code, if we keep this class around, we
-// should probably subclass from NSWindowController.
-@interface FirstRunDialogController : NSObject {
-  IBOutlet NSWindow* first_run_dialog_;
-  bool stats_enabled_;
+@interface FirstRunDialogController : NSWindowController {
+  BOOL user_did_cancel_;
+  BOOL stats_enabled_;
+  BOOL make_default_browser_;
+  BOOL import_bookmarks_;
+  int  browser_import_selected_index_;
 }
 
-// One shot method to show the dialog and return the value of the stats
-// enabled/disabled checkbox.
-// returns:
-//  true - stats enabled.
-//  flase - stats disabled.
-- (bool)Show;
+// Called when the "Start Google Chrome" button is pressed.
+- (IBAction)ok:(id)sender;
+
+// Cancel button calls this.
+- (IBAction)cancel:(id)sender;
+
+// Called when the "Learn More" button is pressed.
+- (IBAction)learnMore:(id)sender;
+
+// Properties for bindings
+@property(assign) BOOL userDidCancel;
+@property(assign) BOOL statsEnabled;
+@property(assign) BOOL makeDefaultBrowser;
+@property(assign) BOOL importBookmarks;
+@property(assign) int browserImportSelectedIndex;
 
-// Called when the OK button is pressed.
-- (IBAction)CloseDialog:(id)sender;
 @end
 
 #endif  // CHROME_BROWSER_FIRST_RUN_DIALOG_H_
diff --git a/chrome/browser/cocoa/first_run_dialog.mm b/chrome/browser/cocoa/first_run_dialog.mm
index cb4e0c9..7af9bcd 100644
--- a/chrome/browser/cocoa/first_run_dialog.mm
+++ b/chrome/browser/cocoa/first_run_dialog.mm
@@ -10,24 +10,23 @@
 
 @implementation FirstRunDialogController
 
--(id)init {
-  self = [super init];
+@synthesize userDidCancel = user_did_cancel_;
+@synthesize statsEnabled = stats_enabled_;
+@synthesize makeDefaultBrowser = make_default_browser_;
+@synthesize importBookmarks = import_bookmarks_;
+@synthesize browserImportSelectedIndex = browser_import_selected_index_;
+
+- (id)init {
+  self = [super initWithWindowNibName:@"FirstRunDialog"];
   if (self != nil) {
     // Bound to the dialog checkbox, default to true.
-    stats_enabled_ = true;
+    stats_enabled_ = YES;
+    import_bookmarks_ = YES;
   }
   return self;
 }
 
-- (bool)Show {
-  // Load and instantiate our NIB
-  scoped_nsobject<NSNib> nib([[NSNib alloc]
-      initWithNibNamed:@"FirstRunDialog"
-                bundle:mac_util::MainAppBundle()]);
-  CHECK(nib);
-  [nib.get() instantiateNibWithOwner:self topLevelObjects:nil];
-  CHECK(first_run_dialog_);  // Should be set by above call.
-
+- (IBAction)showWindow:(id)sender {
   // Neat weirdness in the below code - the Application menu stays enabled
   // while the window is open but selecting items from it (e.g. Quit) has
   // no effect.  I'm guessing that this is an artifact of us being a
@@ -35,18 +34,30 @@
   // window.
 
   // Display dialog.
-  [NSApp runModalForWindow:first_run_dialog_];
-  // First run dialog has "release on close" disabled, otherwise the
-  // runModalForWindow call above crashes.
-  [first_run_dialog_ release];
-  first_run_dialog_ = nil;
-
-  return stats_enabled_;
+  NSWindow* win = [self window];
+  [NSApp runModalForWindow:win];
 }
 
-- (IBAction)CloseDialog:(id)sender {
-  [first_run_dialog_ close];
+- (void)closeDialog {
+  [[self window] close];
   [NSApp stopModal];
 }
 
+- (IBAction)ok:(id)sender {
+  [self closeDialog];
+}
+
+- (IBAction)cancel:(id)sender {
+  [self closeDialog];
+  [self setUserDidCancel:YES];
+}
+
+- (IBAction)learnMore:(id)sender {
+  // TODO(jeremy): Rather than always using English, set the language that
+  // Chrome is running in.
+  NSURL* learnMoreUrl = [NSURL URLWithString:@"http://www.google.com/support/"
+                            "chrome/bin/answer.py?answer=96817&hl=en"];
+  [[NSWorkspace sharedWorkspace] openURL:learnMoreUrl];
+}
+
 @end
diff --git a/chrome/browser/first_run_mac.mm b/chrome/browser/first_run_mac.mm
index 7292e9d..2764a31 100644
--- a/chrome/browser/first_run_mac.mm
+++ b/chrome/browser/first_run_mac.mm
@@ -8,6 +8,8 @@
 #include "base/sys_string_conversions.h"
 #import "chrome/app/breakpad_mac.h"
 #import "chrome/browser/cocoa/first_run_dialog.h"
+#include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/shell_integration.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 
@@ -44,9 +46,15 @@ bool OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton) {
   scoped_nsobject<FirstRunDialogController> dialog(
       [[FirstRunDialogController alloc] init]);
 
-  bool stats_enabled = [dialog.get() Show];
+  // FirstRunDialogController will call exit if "Cancel" is clicked.
+  [dialog.get() showWindow:nil];
 
-  GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled);
+  // If user clicked cancel, bail.
+  if ([dialog.get() userDidCancel]) {
+    return false;
+  }
+
+  BOOL stats_enabled = [dialog.get() statsEnabled];
 
   // Breakpad is normally enabled very early in the startup process,
   // however, on the first run it's off by default.  If the user opts-in to
@@ -55,6 +63,17 @@ bool OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton) {
     InitCrashReporter();
     InitCrashProcessInfo();
   }
+
+  GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled);
+
+  BOOL make_default_browser = [dialog.get() makeDefaultBrowser];
+  if (make_default_browser) {
+    bool success = ShellIntegration::SetAsDefaultBrowser();
+    DCHECK(success);
+  }
+
+  // TODO(jeremy): Import Bookmarks.
+
 #endif  // defined(GOOGLE_CHROME_BUILD)
   return true;
 }