Remove importer views that aren't used any more.

BUG=none
TEST=trybots

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

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

15 files changed, 2 insertions, 3368 deletions

diff --git a/chrome/app/nibs/ImportSettingsDialog.xib b/chrome/app/nibs/ImportSettingsDialog.xib
deleted file mode 100644
index 1b0885a..0000000
--- a/chrome/app/nibs/ImportSettingsDialog.xib
+++ /dev/null
@@ -1,2074 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F2108</string>
-		<string key="IBDocument.InterfaceBuilderVersion">823</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">823</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">ImportSettingsDialogController</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">1</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 314}, {330, 196}}</string>
-				<int key="NSWTFlags">536871936</int>
-				<string key="NSWindowTitle">^IDS_IMPORT_SETTINGS_TITLE</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSCustomView" id="913870182">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">289</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSButton" id="287263597">
-									<reference key="NSNextResponder" ref="913870182"/>
-									<int key="NSvFlags">289</int>
-									<string key="NSFrame">{{14, 12}, {96, 32}}</string>
-									<reference key="NSSuperview" ref="913870182"/>
-									<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">^IDS_CANCEL</string>
-										<object class="NSFont" key="NSSupport" id="605141190">
-											<string key="NSName">LucidaGrande</string>
-											<double key="NSSize">13</double>
-											<int key="NSfFlags">1044</int>
-										</object>
-										<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="913870182"/>
-									<int key="NSvFlags">289</int>
-									<string key="NSFrame">{{110, 12}, {104, 32}}</string>
-									<reference key="NSSuperview" ref="913870182"/>
-									<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">^IDS_IMPORT_COMMIT</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>
-							<string key="NSFrame">{{102, 0}, {228, 47}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
-						</object>
-						<object class="NSCustomView" id="581221161">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">292</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSTextField" id="1020899826">
-									<reference key="NSNextResponder" ref="581221161"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 10}, {91, 17}}</string>
-									<reference key="NSSuperview" ref="581221161"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="712740622">
-										<int key="NSCellFlags">68288064</int>
-										<int key="NSCellFlags2">272630784</int>
-										<string key="NSContents">^IDS_IMPORT_FROM_LABEL</string>
-										<reference key="NSSupport" ref="605141190"/>
-										<reference key="NSControlView" ref="1020899826"/>
-										<object class="NSColor" key="NSBackgroundColor" id="394777803">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">controlColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-											</object>
-										</object>
-										<object class="NSColor" key="NSTextColor" id="550581985">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">controlTextColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MAA</bytes>
-											</object>
-										</object>
-									</object>
-								</object>
-							</object>
-							<string key="NSFrame">{{0, 158}, {105, 33}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
-						</object>
-						<object class="NSCustomView" id="978310322">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">292</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSButton" id="954452115">
-									<reference key="NSNextResponder" ref="978310322"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 66}, {235, 18}}</string>
-									<reference key="NSSuperview" ref="978310322"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="241240932">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">0</int>
-										<string key="NSContents">^IDS_IMPORT_HISTORY_CHKBOX</string>
-										<reference key="NSSupport" ref="605141190"/>
-										<reference key="NSControlView" ref="954452115"/>
-										<int key="NSButtonFlags">1211912703</int>
-										<int key="NSButtonFlags2">2</int>
-										<object class="NSCustomResource" key="NSNormalImage" id="437518122">
-											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">NSSwitch</string>
-										</object>
-										<object class="NSButtonImageSource" key="NSAlternateImage" id="387174411">
-											<string key="NSImageName">NSSwitch</string>
-										</object>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-								</object>
-								<object class="NSButton" id="556808145">
-									<reference key="NSNextResponder" ref="978310322"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 46}, {235, 18}}</string>
-									<reference key="NSSuperview" ref="978310322"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="36000965">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">0</int>
-										<string key="NSContents">^IDS_IMPORT_FAVORITES_CHKBOX</string>
-										<reference key="NSSupport" ref="605141190"/>
-										<reference key="NSControlView" ref="556808145"/>
-										<int key="NSButtonFlags">1211912703</int>
-										<int key="NSButtonFlags2">2</int>
-										<reference key="NSNormalImage" ref="437518122"/>
-										<reference key="NSAlternateImage" ref="387174411"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-								</object>
-								<object class="NSButton" id="763356826">
-									<reference key="NSNextResponder" ref="978310322"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 26}, {235, 18}}</string>
-									<reference key="NSSuperview" ref="978310322"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="460770311">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">0</int>
-										<string key="NSContents">^IDS_IMPORT_PASSWORDS_CHKBOX</string>
-										<reference key="NSSupport" ref="605141190"/>
-										<reference key="NSControlView" ref="763356826"/>
-										<int key="NSButtonFlags">1211912703</int>
-										<int key="NSButtonFlags2">2</int>
-										<reference key="NSNormalImage" ref="437518122"/>
-										<reference key="NSAlternateImage" ref="387174411"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-								</object>
-								<object class="NSButton" id="642124660">
-									<reference key="NSNextResponder" ref="978310322"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 6}, {235, 18}}</string>
-									<reference key="NSSuperview" ref="978310322"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="25343378">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">0</int>
-										<string key="NSContents">^IDS_IMPORT_SEARCH_ENGINES_CHKBOX</string>
-										<reference key="NSSupport" ref="605141190"/>
-										<reference key="NSControlView" ref="642124660"/>
-										<int key="NSButtonFlags">1211912703</int>
-										<int key="NSButtonFlags2">2</int>
-										<reference key="NSNormalImage" ref="437518122"/>
-										<reference key="NSAlternateImage" ref="387174411"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-								</object>
-								<object class="NSTextField" id="249453492">
-									<reference key="NSNextResponder" ref="978310322"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{4, 90}, {249, 17}}</string>
-									<reference key="NSSuperview" ref="978310322"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="826519617">
-										<int key="NSCellFlags">68288064</int>
-										<int key="NSCellFlags2">272630784</int>
-										<string key="NSContents">^IDS_IMPORT_ITEMS_LABEL</string>
-										<reference key="NSSupport" ref="605141190"/>
-										<reference key="NSControlView" ref="249453492"/>
-										<reference key="NSBackgroundColor" ref="394777803"/>
-										<reference key="NSTextColor" ref="550581985"/>
-									</object>
-								</object>
-							</object>
-							<string key="NSFrame">{{20, 49}, {310, 110}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
-						</object>
-						<object class="NSPopUpButton" id="21765562">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">-2147483380</int>
-							<string key="NSFrame">{{110, 162}, {146, 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>
-					<string key="NSFrameSize">{330, 196}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
-			<object class="NSCustomObject" id="689012122">
-				<string key="NSClassName">ChromeUILocalizer</string>
-			</object>
-			<object class="NSCustomObject" id="287929755">
-				<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
-			</object>
-			<object class="NSArrayController" id="142696823">
-				<object class="NSMutableArray" key="NSDeclaredKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>kBrowserProfileNameKey</string>
-					<string>browserName</string>
-				</object>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">65</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="IBOutletConnection" key="connection">
-						<string key="label">uiObject_</string>
-						<reference key="source" ref="287929755"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">99</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">localizer_</string>
-						<reference key="source" ref="287929755"/>
-						<reference key="destination" ref="689012122"/>
-					</object>
-					<int key="connectionID">100</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: sourceBrowsersList</string>
-						<reference key="source" ref="142696823"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="142696823"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">contentArray: sourceBrowsersList</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">sourceBrowsersList</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">109</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: importSomething</string>
-						<reference key="source" ref="458129764"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="458129764"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: importSomething</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">importSomething</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">130</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: importHistory</string>
-						<reference key="source" ref="954452115"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="954452115"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: importHistory</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">importHistory</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">158</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: importFavorites</string>
-						<reference key="source" ref="556808145"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="556808145"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: importFavorites</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">importFavorites</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">159</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: importPasswords</string>
-						<reference key="source" ref="763356826"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="763356826"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: importPasswords</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">importPasswords</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">161</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: importSearchEngines</string>
-						<reference key="source" ref="642124660"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="642124660"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: importSearchEngines</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">importSearchEngines</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">162</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: historyAvailable</string>
-						<reference key="source" ref="954452115"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="954452115"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: historyAvailable</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">historyAvailable</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">164</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: favoritesAvailable</string>
-						<reference key="source" ref="556808145"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="556808145"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: favoritesAvailable</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">favoritesAvailable</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">165</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: passwordsAvailable</string>
-						<reference key="source" ref="763356826"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="763356826"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: passwordsAvailable</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">passwordsAvailable</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">167</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: searchEnginesAvailable</string>
-						<reference key="source" ref="642124660"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="642124660"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: searchEnginesAvailable</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">searchEnginesAvailable</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">168</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">172</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.browserName</string>
-						<reference key="source" ref="21765562"/>
-						<reference key="destination" ref="142696823"/>
-						<object class="NSNibBindingConnector" key="connector" id="715727727">
-							<reference key="NSSource" ref="21765562"/>
-							<reference key="NSDestination" ref="142696823"/>
-							<string key="NSLabel">contentValues: arrangedObjects.browserName</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.browserName</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">173</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedIndex: sourceBrowserIndex</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: sourceBrowserIndex</string>
-							<string key="NSBinding">selectedIndex</string>
-							<string key="NSKeyPath">sourceBrowserIndex</string>
-							<reference key="NSPreviousConnector" ref="715727727"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">174</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">sourceProfilePopUpButton_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="21765562"/>
-					</object>
-					<int key="connectionID">175</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">viewToSlideAndResize_</string>
-						<reference key="source" ref="581221161"/>
-						<reference key="destination" ref="21765562"/>
-					</object>
-					<int key="connectionID">176</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1006"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="581221161"/>
-							<reference ref="978310322"/>
-							<reference ref="913870182"/>
-							<reference ref="21765562"/>
-						</object>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">91</int>
-						<reference key="object" ref="689012122"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">97</int>
-						<reference key="object" ref="913870182"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="287263597"/>
-							<reference ref="458129764"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">25</int>
-						<reference key="object" ref="287263597"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1066198765"/>
-						</object>
-						<reference key="parent" ref="913870182"/>
-					</object>
-					<object class="IBObjectRecord">
-						<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="913870182"/>
-					</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">98</int>
-						<reference key="object" ref="287929755"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">101</int>
-						<reference key="object" ref="581221161"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1020899826"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">105</int>
-						<reference key="object" ref="142696823"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Browser List</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">110</int>
-						<reference key="object" ref="1020899826"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="712740622"/>
-						</object>
-						<reference key="parent" ref="581221161"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">111</int>
-						<reference key="object" ref="712740622"/>
-						<reference key="parent" ref="1020899826"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="978310322"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="954452115"/>
-							<reference ref="763356826"/>
-							<reference ref="642124660"/>
-							<reference ref="249453492"/>
-							<reference ref="556808145"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="954452115"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="241240932"/>
-						</object>
-						<reference key="parent" ref="978310322"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="556808145"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="36000965"/>
-						</object>
-						<reference key="parent" ref="978310322"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">147</int>
-						<reference key="object" ref="763356826"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="460770311"/>
-						</object>
-						<reference key="parent" ref="978310322"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">148</int>
-						<reference key="object" ref="642124660"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="25343378"/>
-						</object>
-						<reference key="parent" ref="978310322"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="249453492"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="826519617"/>
-						</object>
-						<reference key="parent" ref="978310322"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="826519617"/>
-						<reference key="parent" ref="249453492"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">151</int>
-						<reference key="object" ref="25343378"/>
-						<reference key="parent" ref="642124660"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">152</int>
-						<reference key="object" ref="460770311"/>
-						<reference key="parent" ref="763356826"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">154</int>
-						<reference key="object" ref="36000965"/>
-						<reference key="parent" ref="556808145"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">155</int>
-						<reference key="object" ref="241240932"/>
-						<reference key="parent" ref="954452115"/>
-					</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>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>1.IBViewEditorWindowController.showingLayoutRectangles</string>
-					<string>1.IBWindowTemplateEditedContentRect</string>
-					<string>1.NSWindowTemplate.visibleAtLaunch</string>
-					<string>1.WindowOrigin</string>
-					<string>1.editorWindowContentRectSynchronizationRect</string>
-					<string>105.IBPluginDependency</string>
-					<string>110.IBPluginDependency</string>
-					<string>111.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>147.IBPluginDependency</string>
-					<string>148.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
-					<string>15.IBViewBoundsToFrameTransform</string>
-					<string>150.IBPluginDependency</string>
-					<string>151.IBPluginDependency</string>
-					<string>152.IBPluginDependency</string>
-					<string>154.IBPluginDependency</string>
-					<string>155.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>25.IBPluginDependency</string>
-					<string>26.IBPluginDependency</string>
-					<string>27.IBPluginDependency</string>
-					<string>28.IBPluginDependency</string>
-					<string>91.IBPluginDependency</string>
-					<string>98.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>{{650, 593}, {330, 196}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<boolean value="YES"/>
-					<string>{{650, 593}, {330, 196}}</string>
-					<boolean value="NO"/>
-					<string>{196, 240}</string>
-					<string>{{357, 418}, {480, 270}}</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>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBAAAAwgQAAA</bytes>
-					</object>
-					<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>{{465, 184}, {146, 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>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">176</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChromeUILocalizer</string>
-					<string key="superclassName">GTMUILocalizer</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/ui/cocoa/ui_localizer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">GTMUILocalizer</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>otherObjectToLocalize_</string>
-							<string>owner_</string>
-							<string>yetAnotherObjectToLocalize_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>otherObjectToLocalize_</string>
-							<string>owner_</string>
-							<string>yetAnotherObjectToLocalize_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">otherObjectToLocalize_</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">owner_</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">yetAnotherObjectToLocalize_</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">GTMUILocalizerAndLayoutTweaker</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>localizerOwner_</string>
-							<string>localizer_</string>
-							<string>uiObject_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>GTMUILocalizer</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>localizerOwner_</string>
-							<string>localizer_</string>
-							<string>uiObject_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">localizerOwner_</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">localizer_</string>
-								<string key="candidateClassName">GTMUILocalizer</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">uiObject_</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1031264906">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">GTMWidthBasedTweaker</string>
-					<string key="superclassName">NSView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>viewToResize_</string>
-							<string>viewToSlideAndResize_</string>
-							<string>viewToSlide_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>NSView</string>
-							<string>NSView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>viewToResize_</string>
-							<string>viewToSlideAndResize_</string>
-							<string>viewToSlide_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">viewToResize_</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">viewToSlideAndResize_</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">viewToSlide_</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-						</object>
-					</object>
-					<reference key="sourceIdentifier" ref="1031264906"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ImportSettingsDialogController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancel:</string>
-							<string>ok:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancel:</string>
-							<string>ok:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">cancel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">ok:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">sourceProfilePopUpButton_</string>
-						<string key="NS.object.0">NSPopUpButton</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">sourceProfilePopUpButton_</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">sourceProfilePopUpButton_</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/ui/cocoa/importer/import_settings_dialog.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ImportSettingsDialogController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>sourceBrowserIndex</string>
-							<string>sourceBrowsersList</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSUInteger</string>
-							<string>NSArray</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>sourceBrowserIndex</string>
-							<string>sourceBrowsersList</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">sourceBrowserIndex</string>
-								<string key="candidateClassName">NSUInteger</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">sourceBrowsersList</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItem</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/ui/cocoa/nsmenuitem_additions.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.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/ui/cocoa/objc_zombie.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/ui/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/ui/cocoa/tabs/tab_strip_model_observer_bridge.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/ui/cocoa/view_id_util.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/ui/cocoa/framed_browser_window.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/ui/cocoa/themed_window.h</string>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSActionCell</string>
-					<string key="superclassName">NSCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="537205179">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="411943064">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="249387513">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArray</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSArray.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArray</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="286563741">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArray</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="514916810">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArray</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPathUtilities.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArray</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPredicate.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArray</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSSortDescriptor.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSArrayController</string>
-					<string key="superclassName">NSObjectController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSButton</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSButtonCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSCell</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSControl</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="735463067">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSFormatter</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenu</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="220868340">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItem</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="371494378">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItemCell</string>
-					<string key="superclassName">NSButtonCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AddressBook.framework/Headers/ABActions.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSAlert.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSAnimation.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="537205179"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="411943064"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="249387513"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="735463067"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDatePickerCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="498494388">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSImage.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="220868340"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSRuleEditor.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSound.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSpeechRecognizer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSpeechSynthesizer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTabView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSText.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextStorage.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTokenField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTokenFieldCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="650564038">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="673639355">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSConnection.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="286563741"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="514916810"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSMetadata.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPort.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSSpellServer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSStream.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">SecurityInterface.framework/Headers/SFCertificatePanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">SecurityInterface.framework/Headers/SFChooseIdentityPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObjectController</string>
-					<string key="superclassName">NSController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSObjectController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSPopUpButton</string>
-					<string key="superclassName">NSButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSPopUpButtonCell</string>
-					<string key="superclassName">NSMenuItemCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextField</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextFieldCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<reference key="sourceIdentifier" ref="371494378"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<string key="superclassName">NSResponder</string>
-					<reference key="sourceIdentifier" ref="650564038"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<reference key="sourceIdentifier" ref="498494388"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<string key="superclassName">NSResponder</string>
-					<reference key="sourceIdentifier" ref="673639355"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindowController</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">showWindow:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">showWindow:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">showWindow:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-				<string>NSSwitch</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-				<string>{15, 15}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 337365d..eb627ea 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -39,7 +39,6 @@
 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"
-#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 5c28a71..5f358d8 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -42,7 +42,7 @@ class Toolbar5Importer : public URLFetcher::Delegate, public Importer {
   Toolbar5Importer();
 
   // Importer:
-  // ImportDialogView calls this method to begin the process. |items| should
+  // The importer view calls this method to begin the process. |items| should
   // only either be NONE or FAVORITES, since as of right now these are the only
   // items this importer supports.
   virtual void StartImport(const importer::ProfileInfo& profile_info,
@@ -50,7 +50,7 @@ class Toolbar5Importer : public URLFetcher::Delegate, public Importer {
                            ImporterBridge* bridge) OVERRIDE;
 
   // Importer view call this method when the user clicks the cancel button
-  // in the ImportDialogView UI.  We need to post a message to our loop
+  // in the tabbed options UI.  We need to post a message to our loop
   // to cancel network retrieval.
   virtual void Cancel();
 
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index b3b4c003..37049d6 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -25,7 +25,6 @@
 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
-#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h"
diff --git a/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h
deleted file mode 100644
index 2d20602c..0000000
--- a/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_DIALOG_COCOA_H_
-#define CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_DIALOG_COCOA_H_
-#pragma once
-
-#import <Cocoa/Cocoa.h>
-
-#include "base/scoped_nsobject.h"
-#include "chrome/browser/importer/importer_host.h"
-
-class Profile;
-class ImporterListObserverBridge;
-
-// Controller for the Import Bookmarks and Settings dialog.  This controller
-// automatically autoreleases itself when its associated dialog is dismissed.
-@interface ImportDialogController : NSWindowController {
- @private
-  NSWindow* parentWindow_;  // weak
-  Profile* profile_;  // weak
-  scoped_refptr<ImporterList> importerList_;
-  scoped_ptr<ImporterListObserverBridge> importerListObserver_;
-  scoped_nsobject<NSArray> sourceBrowsersList_;
-  NSUInteger sourceBrowserIndex_;
-  // The following are all bound via the properties below.
-  BOOL importHistory_;
-  BOOL importFavorites_;
-  BOOL importPasswords_;
-  BOOL importSearchEngines_;
-  BOOL historyAvailable_;
-  BOOL favoritesAvailable_;
-  BOOL passwordsAvailable_;
-  BOOL searchEnginesAvailable_;
-  IBOutlet NSPopUpButton* sourceProfilePopUpButton_;
-}
-
-// Show the import settings window.  Window is displayed as an app modal dialog.
-// If the dialog is already being displayed, this method whill return with
-// no error.
-+ (void)showImportSettingsDialogForProfile:(Profile*)profile;
-
-// Called when the "Import" button is pressed.
-- (IBAction)ok:(id)sender;
-
-// Cancel button calls this.
-- (IBAction)cancel:(id)sender;
-
-// An array of ImportSettingsProfiles, provide the list of browser profiles
-// available for importing. Bound to the Browser List array controller.
-- (NSArray*)sourceBrowsersList;
-
-// Called when source profiles have been loaded.
-- (void)sourceProfilesLoaded;
-
-// Properties for bindings.
-@property(assign, nonatomic) NSUInteger sourceBrowserIndex;
-@property(assign, readonly, nonatomic) BOOL importSomething;
-// Bindings for the value of the import checkboxes.
-@property(assign, nonatomic) BOOL importHistory;
-@property(assign, nonatomic) BOOL importFavorites;
-@property(assign, nonatomic) BOOL importPasswords;
-@property(assign, nonatomic) BOOL importSearchEngines;
-// Bindings for enabling/disabling the checkboxes.
-@property(assign, readonly, nonatomic) BOOL historyAvailable;
-@property(assign, readonly, nonatomic) BOOL favoritesAvailable;
-@property(assign, readonly, nonatomic) BOOL passwordsAvailable;
-@property(assign, readonly, nonatomic) BOOL searchEnginesAvailable;
-
-@end
-
-@interface ImportDialogController (TestingAPI)
-
-// Initialize by providing an array of source profile dictionaries. Exposed for
-// unit testing but also called by -[initWithProfile:].
-- (id)initWithSourceProfiles:(NSArray*)profiles;
-
-// Return selected services to import as mapped by the ImportItem enum.
-- (uint16)servicesToImport;
-
-@end
-
-// Utility class used as array elements for sourceBrowsersList, above.
-@interface ImportSettingsProfile : NSObject {
- @private
-  NSString* browserName_;
-  uint16 services_;  // Services as defined by enum ImportItem.
-}
-
-// Convenience creator. |services| is a bitfield of enum ImportItems.
-+ (id)importSettingsProfileWithBrowserName:(NSString*)browserName
-                                  services:(uint16)services;
-
-// Designated initializer. |services| is a bitfield of enum ImportItems.
-- (id)initWithBrowserName:(NSString*)browserName
-                 services:(uint16)services;  // Bitfield of enum ImportItems.
-
-@property(copy, nonatomic) NSString* browserName;
-@property(assign, nonatomic) uint16 services;  // Bitfield of enum ImportItems.
-
-@end
-
-#endif  // CHROME_BROWSER_UI_COCOA_IMPORTER_IMPORT_DIALOG_COCOA_H_
diff --git a/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.mm b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.mm
deleted file mode 100644
index df12a15..0000000
--- a/chrome/browser/ui/cocoa/importer/import_dialog_cocoa.mm
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
-
-#include "base/compiler_specific.h"
-#include "base/mac/mac_util.h"
-#include "base/sys_string_conversions.h"
-#include "chrome/browser/importer/external_process_importer_host.h"
-#include "chrome/browser/importer/importer_data_types.h"
-#include "chrome/browser/importer/importer_list.h"
-#include "chrome/browser/importer/importer_progress_dialog.h"
-#include "chrome/browser/profiles/profile.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-
-// Bridge to receive observer messages from an ImporterList and relay
-// them to the ImportDialogController.
-class ImporterListObserverBridge : public ImporterList::Observer {
- public:
-  explicit ImporterListObserverBridge(
-      ImportDialogController *controller);
-
- private:
-  // ImporterList::Observer:
-  virtual void SourceProfilesLoaded() OVERRIDE;
-
-  ImportDialogController* window_controller_;  // weak, owns us.
-};
-
-ImporterListObserverBridge::ImporterListObserverBridge(
-    ImportDialogController *controller)
-  : window_controller_(controller) {
-}
-
-void ImporterListObserverBridge::SourceProfilesLoaded() {
-  [window_controller_ sourceProfilesLoaded];
-}
-
-namespace {
-
-bool importSettingsDialogVisible = false;
-
-}  // namespace
-
-@interface ImportDialogController ()
-
-@property(assign, readwrite, nonatomic) BOOL historyAvailable;
-@property(assign, readwrite, nonatomic) BOOL favoritesAvailable;
-@property(assign, readwrite, nonatomic) BOOL passwordsAvailable;
-@property(assign, readwrite, nonatomic) BOOL searchEnginesAvailable;
-
-@end
-
-@implementation ImportSettingsProfile
-
-@synthesize browserName = browserName_;
-@synthesize services = services_;
-
-+ (id)importSettingsProfileWithBrowserName:(NSString*)browserName
-                                  services:(uint16)services {
-  id settingsProfile = [[[ImportSettingsProfile alloc]
-                        initWithBrowserName:browserName
-                         services:services] autorelease];
-  return settingsProfile;
-}
-
-- (id)initWithBrowserName:(NSString*)browserName
-                 services:(uint16)services {
-  DCHECK(browserName);
-  if ((self = [super init])) {
-    if (browserName) {
-      browserName_ = [browserName retain];
-      services_ = services;
-    } else {
-      [self release];
-      self = nil;
-    }
-  }
-  return self;
-}
-
-- (id)init {
-  NOTREACHED();  // Should never be called.
-  return [self initWithBrowserName:NULL services:0];
-}
-
-- (void)dealloc {
-  [browserName_ release];
-  [super dealloc];
-}
-
-@end
-
-@interface ImportDialogController (Private)
-
-// Initialize the dialog controller with either the default profile or
-// the profile for the current browser.
-- (id)initWithProfile:(Profile*)profile;
-
-// Present the app modal dialog.
-- (void)runModalDialog;
-
-// Close the modal dialog.
-- (void)closeDialog;
-
-@end
-
-@implementation ImportDialogController
-
-@synthesize sourceBrowserIndex = sourceBrowserIndex_;
-@synthesize importHistory = importHistory_;
-@synthesize importFavorites = importFavorites_;
-@synthesize importPasswords = importPasswords_;
-@synthesize importSearchEngines = importSearchEngines_;
-@synthesize historyAvailable = historyAvailable_;
-@synthesize favoritesAvailable = favoritesAvailable_;
-@synthesize passwordsAvailable = passwordsAvailable_;
-@synthesize searchEnginesAvailable = searchEnginesAvailable_;
-
-// Set bindings dependencies for importSomething property.
-+ (NSSet*)keyPathsForValuesAffectingImportSomething {
-  return [NSSet setWithObjects:@"importHistory", @"importFavorites",
-          @"importPasswords", @"importSearchEngines", nil];
-}
-
-+ (void)showImportSettingsDialogForProfile:(Profile*)profile {
-  // Don't display if already visible.
-  if (importSettingsDialogVisible)
-    return;
-  ImportDialogController* controller =
-      [[ImportDialogController alloc] initWithProfile:profile];
-  [controller runModalDialog];
-}
-
-- (id)initWithProfile:(Profile*)profile {
-  // Collect profile information (profile name and the services which can
-  // be imported from each) into an array of ImportSettingsProfile which
-  // are bound to the Browser List array controller and the popup name
-  // presentation.  The services element is used to indirectly control
-  // checkbox enabling.
-  importerList_ = new ImporterList;
-  ImporterList& importerList(*(importerList_.get()));
-  importerListObserver_.reset(new ImporterListObserverBridge(self));
-  importerList.DetectSourceProfiles(importerListObserver_.get());
-
-  if ((self = [self initWithSourceProfiles:nil])) {
-    profile_ = profile;
-  }
-  return self;
-}
-
-- (id)initWithSourceProfiles:(NSArray*)profiles {
-  NSString* nibpath =
-      [base::mac::MainAppBundle() pathForResource:@"ImportSettingsDialog"
-                                          ofType:@"nib"];
-  if ((self = [super initWithWindowNibPath:nibpath owner:self]) && profiles)
-    sourceBrowsersList_.reset([profiles retain]);
-
-  return self;
-}
-
-- (id)init {
-  return [self initWithProfile:nil];
-}
-
-- (void)dealloc {
-  if (importerList_)
-    importerList_->SetObserver(NULL);
-  [super dealloc];
-}
-
-- (void)awakeFromNib {
-  // Force an update of the checkbox enabled states.
-  [self setSourceBrowserIndex:0];
-}
-
-// Run application modal.
-- (void)runModalDialog {
-  importSettingsDialogVisible = true;
-  [NSApp runModalForWindow:[self window]];
-}
-
-- (IBAction)ok:(id)sender {
-  [self closeDialog];
-  const importer::ProfileInfo& sourceProfile =
-      importerList_.get()->GetSourceProfileInfoAt([self sourceBrowserIndex]);
-  uint16 items = sourceProfile.services_supported;
-  uint16 servicesToImport = items & [self servicesToImport];
-  if (servicesToImport) {
-    if (profile_) {
-      ImporterHost* importerHost = new ExternalProcessImporterHost;
-      // Note that a side effect of the following call is to cause the
-      // importerHost to be disposed once the import has completed.
-      importer::ShowImportProgressDialog(
-          nil, servicesToImport, importerHost, nil, sourceProfile, profile_,
-          false);
-    }
-  } else {
-    LOG(WARNING) << "There were no settings to import from '"
-                 << sourceProfile.description << "'.";
-  }
-}
-
-- (IBAction)cancel:(id)sender {
-  [self closeDialog];
-}
-
-- (void)closeDialog {
-  importSettingsDialogVisible = false;
-  [[self window] orderOut:self];
-  [NSApp stopModal];
-  [self autorelease];
-}
-
-- (void)sourceProfilesLoaded {
-  NSMutableArray* browserProfiles;
-  ImporterList& importerList(*(importerList_.get()));
-  int profilesCount = importerList.GetAvailableProfileCount();
-  if (profilesCount) {
-    browserProfiles =
-        [[NSMutableArray alloc] initWithCapacity:profilesCount];
-    for (int i = 0; i < profilesCount; ++i) {
-      const importer::ProfileInfo& sourceProfile =
-          importerList.GetSourceProfileInfoAt(i);
-      NSString* browserName =
-          base::SysWideToNSString(sourceProfile.description);
-      uint16 browserServices = sourceProfile.services_supported;
-      ImportSettingsProfile* settingsProfile =
-          [ImportSettingsProfile
-              importSettingsProfileWithBrowserName:browserName
-                                          services:browserServices];
-      [browserProfiles addObject:settingsProfile];
-    }
-  } else {
-    browserProfiles =
-        [[NSMutableArray alloc] initWithCapacity:1];
-    NSString* dummyName = l10n_util::GetNSString(IDS_IMPORT_NO_PROFILE_FOUND);
-    ImportSettingsProfile* dummySourceProfile =
-        [ImportSettingsProfile importSettingsProfileWithBrowserName:dummyName
-                                                           services:0];
-    [browserProfiles addObject:dummySourceProfile];
-  }
-
-  [self willChangeValueForKey:@"sourceBrowsersList"];
-  sourceBrowsersList_.reset(browserProfiles);
-  [self didChangeValueForKey:@"sourceBrowsersList"];
-
-  // Force an update of the checkbox enabled states.
-  [self setSourceBrowserIndex:0];
-
-  // Resize and show the popup button.
-  [sourceProfilePopUpButton_ sizeToFit];
-  [sourceProfilePopUpButton_ setHidden:NO];
-}
-
-#pragma mark Accessors
-
-- (NSArray*)sourceBrowsersList {
-  return sourceBrowsersList_.get();
-}
-
-// Accessor which cascades selected-browser changes into a re-evaluation of the
-// available services and the associated checkbox enable and checked states.
-- (void)setSourceBrowserIndex:(NSUInteger)browserIndex {
-  uint16 items = 0;
-  if ([sourceBrowsersList_.get() count]) {
-    [self willChangeValueForKey:@"sourceBrowserIndex"];
-    sourceBrowserIndex_ = browserIndex;
-    [self didChangeValueForKey:@"sourceBrowserIndex"];
-
-    ImportSettingsProfile* profile =
-        [sourceBrowsersList_.get() objectAtIndex:browserIndex];
-    items = [profile services];
-  }
-  [self setHistoryAvailable:(items & importer::HISTORY) ? YES : NO];
-  [self setImportHistory:[self historyAvailable]];
-  [self setFavoritesAvailable:(items & importer::FAVORITES) ? YES : NO];
-  [self setImportFavorites:[self favoritesAvailable]];
-  [self setPasswordsAvailable:(items & importer::PASSWORDS) ? YES : NO];
-  [self setImportPasswords:[self passwordsAvailable]];
-  [self setSearchEnginesAvailable:(items & importer::SEARCH_ENGINES) ?
-      YES : NO];
-  [self setImportSearchEngines:[self searchEnginesAvailable]];
-}
-
-- (uint16)servicesToImport {
-  uint16 servicesToImport = 0;
-  if ([self importHistory]) servicesToImport |= importer::HISTORY;
-  if ([self importFavorites]) servicesToImport |= importer::FAVORITES;
-  if ([self importPasswords]) servicesToImport |= importer::PASSWORDS;
-  if ([self importSearchEngines]) servicesToImport |=
-      importer::SEARCH_ENGINES;
-  return servicesToImport;
-}
-
-// KVO accessor which returns YES if at least one of the services
-// provided by the selected profile has been marked for importing
-// and bound to the OK button's enable property.
-- (BOOL)importSomething {
-  return [self importHistory] || [self importFavorites] ||
-      [self importPasswords] || [self importSearchEngines];
-}
-
-@end
diff --git a/chrome/browser/ui/cocoa/importer/import_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/importer/import_dialog_cocoa_unittest.mm
deleted file mode 100644
index e9cf7aa..0000000
--- a/chrome/browser/ui/cocoa/importer/import_dialog_cocoa_unittest.mm
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Cocoa/Cocoa.h>
-
-#include "base/scoped_nsobject.h"
-#include "chrome/browser/importer/importer_host.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/importer/import_dialog_cocoa.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
-
-class ImportSettingsDialogTest : public CocoaTest {
- public:
-  ImportDialogController* controller_;
-
-  virtual void SetUp() {
-    CocoaTest::SetUp();
-    uint16 safariServices = importer::HISTORY | importer::FAVORITES |
-                            importer::COOKIES | importer::PASSWORDS |
-                            importer::SEARCH_ENGINES;
-    ImportSettingsProfile* mockSafari =
-        [ImportSettingsProfile
-         importSettingsProfileWithBrowserName:@"MockSafari"
-                                     services:safariServices];
-    uint16 firefoxServices = importer::HISTORY | importer::FAVORITES |
-                             importer::COOKIES | importer::PASSWORDS;
-    ImportSettingsProfile* mockFirefox =
-        [ImportSettingsProfile
-         importSettingsProfileWithBrowserName:@"MockFirefox"
-                                     services:firefoxServices];
-    uint16 caminoServices = importer::HISTORY | importer::COOKIES |
-                            importer::SEARCH_ENGINES;
-    ImportSettingsProfile* mockCamino =
-        [ImportSettingsProfile
-         importSettingsProfileWithBrowserName:@"MockCamino"
-                                     services:caminoServices];
-    NSArray* browsers = [NSArray arrayWithObjects:
-                         mockSafari, mockFirefox, mockCamino, nil];
-    controller_ = [[ImportDialogController alloc]
-                   initWithSourceProfiles:browsers];
-  }
-
-  virtual void TearDown() {
-    controller_ = NULL;
-    CocoaTest::TearDown();
-  }
-};
-
-TEST_F(ImportSettingsDialogTest, CancelDialog) {
-  [controller_ cancel:nil];
-}
-
-TEST_F(ImportSettingsDialogTest, ChooseVariousBrowsers) {
-  // Initial choice should already be MockSafari with all items enabled.
-  [controller_ setSourceBrowserIndex:0];
-  EXPECT_TRUE([controller_ importHistory]);
-  EXPECT_TRUE([controller_ historyAvailable]);
-  EXPECT_TRUE([controller_ importFavorites]);
-  EXPECT_TRUE([controller_ favoritesAvailable]);
-  EXPECT_TRUE([controller_ importPasswords]);
-  EXPECT_TRUE([controller_ passwordsAvailable]);
-  EXPECT_TRUE([controller_ importSearchEngines]);
-  EXPECT_TRUE([controller_ searchEnginesAvailable]);
-  EXPECT_EQ(importer::HISTORY | importer::FAVORITES | importer::PASSWORDS |
-            importer::SEARCH_ENGINES,
-            [controller_ servicesToImport]);
-
-  // Next choice we test is MockCamino.
-  [controller_ setSourceBrowserIndex:2];
-  EXPECT_TRUE([controller_ importHistory]);
-  EXPECT_TRUE([controller_ historyAvailable]);
-  EXPECT_FALSE([controller_ importFavorites]);
-  EXPECT_FALSE([controller_ favoritesAvailable]);
-  EXPECT_FALSE([controller_ importPasswords]);
-  EXPECT_FALSE([controller_ passwordsAvailable]);
-  EXPECT_TRUE([controller_ importSearchEngines]);
-  EXPECT_TRUE([controller_ searchEnginesAvailable]);
-  EXPECT_EQ(importer::HISTORY | importer::SEARCH_ENGINES,
-            [controller_ servicesToImport]);
-
-  // Next choice we test is MockFirefox.
-  [controller_ setSourceBrowserIndex:1];
-  EXPECT_TRUE([controller_ importHistory]);
-  EXPECT_TRUE([controller_ historyAvailable]);
-  EXPECT_TRUE([controller_ importFavorites]);
-  EXPECT_TRUE([controller_ favoritesAvailable]);
-  EXPECT_TRUE([controller_ importPasswords]);
-  EXPECT_TRUE([controller_ passwordsAvailable]);
-  EXPECT_FALSE([controller_ importSearchEngines]);
-  EXPECT_FALSE([controller_ searchEnginesAvailable]);
-  EXPECT_EQ(importer::HISTORY | importer::FAVORITES | importer::PASSWORDS,
-            [controller_ servicesToImport]);
-
-  [controller_ cancel:nil];
-}
-
-TEST_F(ImportSettingsDialogTest, SetVariousSettings) {
-  // Leave the choice MockSafari, but toggle the settings.
-  [controller_ setImportHistory:NO];
-  [controller_ setImportFavorites:NO];
-  [controller_ setImportPasswords:NO];
-  [controller_ setImportSearchEngines:NO];
-  EXPECT_EQ(importer::NONE, [controller_ servicesToImport]);
-  EXPECT_FALSE([controller_ importSomething]);
-
-  [controller_ setImportHistory:YES];
-  EXPECT_EQ(importer::HISTORY, [controller_ servicesToImport]);
-  EXPECT_TRUE([controller_ importSomething]);
-
-  [controller_ setImportHistory:NO];
-  [controller_ setImportFavorites:YES];
-  EXPECT_EQ(importer::FAVORITES, [controller_ servicesToImport]);
-  EXPECT_TRUE([controller_ importSomething]);
-  [controller_ setImportFavorites:NO];
-
-  [controller_ setImportPasswords:YES];
-  EXPECT_EQ(importer::PASSWORDS, [controller_ servicesToImport]);
-  EXPECT_TRUE([controller_ importSomething]);
-
-  [controller_ setImportPasswords:NO];
-  [controller_ setImportSearchEngines:YES];
-  EXPECT_EQ(importer::SEARCH_ENGINES, [controller_ servicesToImport]);
-  EXPECT_TRUE([controller_ importSomething]);
-
-  [controller_ cancel:nil];
-}
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 8704e7c..4ab240e 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -53,7 +53,6 @@
 #include "chrome/browser/ui/gtk/gtk_floating_container.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/importer/import_dialog_gtk.h"
 #include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
diff --git a/chrome/browser/ui/gtk/importer/import_dialog_gtk.cc b/chrome/browser/ui/gtk/importer/import_dialog_gtk.cc
deleted file mode 100644
index afd46ba..0000000
--- a/chrome/browser/ui/gtk/importer/import_dialog_gtk.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/gtk/importer/import_dialog_gtk.h"
-
-#include <string>
-
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/importer/importer_data_types.h"
-#include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/importer/importer_progress_dialog.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
-#include "grit/generated_resources.h"
-#include "grit/locale_settings.h"
-#include "ui/base/l10n/l10n_util.h"
-
-namespace {
-
-// Returns true if the checkbox is checked.
-gboolean IsChecked(GtkWidget* widget) {
-  return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-}
-
-}  // namespace
-
-// static
-void ImportDialogGtk::Show(GtkWindow* parent, Profile* profile,
-                           uint16 initial_state) {
-  new ImportDialogGtk(parent, profile, initial_state);
-}
-
-ImportDialogGtk::ImportDialogGtk(GtkWindow* parent, Profile* profile,
-                                 uint16 initial_state)
-    : parent_(parent),
-      profile_(profile),
-      importer_host_(new ImporterHost),
-      ALLOW_THIS_IN_INITIALIZER_LIST(importer_list_(new ImporterList)),
-      initial_state_(initial_state) {
-  // Load the available source profiles.
-  importer_list_->DetectSourceProfiles(this);
-
-  // Build the dialog.
-  std::string dialog_name = l10n_util::GetStringUTF8(
-      IDS_IMPORT_SETTINGS_TITLE);
-  dialog_ = gtk_dialog_new_with_buttons(
-      dialog_name.c_str(),
-      parent,
-      (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
-      GTK_STOCK_CANCEL,
-      GTK_RESPONSE_REJECT,
-      NULL);
-
-  importer_host_->set_parent_window(GTK_WINDOW(dialog_));
-
-  // Add import button separately as we might need to disable it, if
-  // no supported browsers found.
-  import_button_ = gtk_util::AddButtonToDialog(dialog_,
-      l10n_util::GetStringUTF8(IDS_IMPORT_COMMIT).c_str(),
-      GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT);
-  GTK_WIDGET_SET_FLAGS(import_button_, GTK_CAN_DEFAULT);
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_ACCEPT);
-
-  GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox;
-  gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
-
-  GtkWidget* combo_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
-  GtkWidget* from = gtk_label_new(
-      l10n_util::GetStringUTF8(IDS_IMPORT_FROM_LABEL).c_str());
-  gtk_box_pack_start(GTK_BOX(combo_hbox), from, FALSE, FALSE, 0);
-
-  combo_ = gtk_combo_box_new_text();
-  gtk_box_pack_start(GTK_BOX(combo_hbox), combo_, TRUE, TRUE, 0);
-
-  gtk_box_pack_start(GTK_BOX(content_area), combo_hbox, FALSE, FALSE, 0);
-
-  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
-
-  GtkWidget* description = gtk_label_new(
-      l10n_util::GetStringUTF8(IDS_IMPORT_ITEMS_LABEL).c_str());
-  gtk_misc_set_alignment(GTK_MISC(description), 0, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), description, FALSE, FALSE, 0);
-
-  bookmarks_ = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_IMPORT_FAVORITES_CHKBOX).c_str());
-  gtk_box_pack_start(GTK_BOX(vbox), bookmarks_, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bookmarks_),
-      (initial_state_ & importer::FAVORITES) != 0);
-  g_signal_connect(bookmarks_, "toggled",
-                   G_CALLBACK(OnDialogWidgetClickedThunk), this);
-
-  search_engines_ = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_IMPORT_SEARCH_ENGINES_CHKBOX).c_str());
-  gtk_box_pack_start(GTK_BOX(vbox), search_engines_, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(search_engines_),
-      (initial_state_ & importer::SEARCH_ENGINES) != 0);
-  g_signal_connect(search_engines_, "toggled",
-                   G_CALLBACK(OnDialogWidgetClickedThunk), this);
-
-  passwords_ = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_IMPORT_PASSWORDS_CHKBOX).c_str());
-  gtk_box_pack_start(GTK_BOX(vbox), passwords_, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(passwords_),
-      (initial_state_ & importer::PASSWORDS) != 0);
-  g_signal_connect(passwords_, "toggled",
-                   G_CALLBACK(OnDialogWidgetClickedThunk), this);
-
-  history_ = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_IMPORT_HISTORY_CHKBOX).c_str());
-  gtk_box_pack_start(GTK_BOX(vbox), history_, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(history_),
-      (initial_state_ & importer::HISTORY) !=0);
-  g_signal_connect(history_, "toggled",
-                   G_CALLBACK(OnDialogWidgetClickedThunk), this);
-
-  gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
-
-  // Let the user know profiles are being loaded.
-  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_),
-      l10n_util::GetStringUTF8(IDS_IMPORT_LOADING_PROFILES).c_str());
-  gtk_combo_box_set_active(GTK_COMBO_BOX(combo_), 0);
-
-  // Disable controls until source profiles are loaded.
-  SetDialogControlsSensitive(false);
-
-  g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
-
-  UpdateDialogButtons();
-
-  gtk_util::ShowDialogWithLocalizedSize(dialog_,
-                                        IDS_IMPORT_DIALOG_WIDTH_CHARS,
-                                        -1,      // height
-                                        false);  // resizable
-}
-
-ImportDialogGtk::~ImportDialogGtk() {
-  if (importer_list_)
-    importer_list_->SetObserver(NULL);
-}
-
-void ImportDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
-  gtk_widget_hide_all(dialog_);
-  if (response_id == GTK_RESPONSE_ACCEPT) {
-    uint16 items = GetCheckedItems();
-    if (items == 0) {
-      ImportCompleted();
-    } else {
-      const importer::ProfileInfo& source_profile =
-          importer_list_->GetSourceProfileInfoAt(
-              gtk_combo_box_get_active(GTK_COMBO_BOX(combo_)));
-      importer::ShowImportProgressDialog(parent_, items, importer_host_, this,
-                                         source_profile, profile_, false);
-    }
-  } else {
-    ImportCanceled();
-  }
-}
-
-void ImportDialogGtk::OnDialogWidgetClicked(GtkWidget* widget) {
-  UpdateDialogButtons();
-}
-
-void ImportDialogGtk::UpdateDialogButtons() {
-  gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog_), GTK_RESPONSE_ACCEPT,
-                                    GetCheckedItems() != 0);
-}
-
-void ImportDialogGtk::SetDialogControlsSensitive(bool sensitive) {
-  gtk_widget_set_sensitive(bookmarks_, sensitive);
-  gtk_widget_set_sensitive(search_engines_, sensitive);
-  gtk_widget_set_sensitive(passwords_, sensitive);
-  gtk_widget_set_sensitive(history_, sensitive);
-  gtk_widget_set_sensitive(import_button_, sensitive);
-}
-
-uint16 ImportDialogGtk::GetCheckedItems() {
-  uint16 items = importer::NONE;
-  if (IsChecked(bookmarks_))
-    items |= importer::FAVORITES;
-  if (IsChecked(search_engines_))
-    items |= importer::SEARCH_ENGINES;
-  if (IsChecked(passwords_))
-    items |= importer::PASSWORDS;
-  if (IsChecked(history_))
-    items |= importer::HISTORY;
-  return items;
-}
-
-void ImportDialogGtk::SourceProfilesLoaded() {
-  // Detect any supported browsers that we can import from and fill
-  // up the combo box. If none found, disable all controls except cancel.
-  int profiles_count = importer_list_->GetAvailableProfileCount();
-  SetDialogControlsSensitive(profiles_count != 0);
-  gtk_combo_box_remove_text(GTK_COMBO_BOX(combo_), 0);
-  if (profiles_count > 0) {
-    for (int i = 0; i < profiles_count; i++) {
-      std::wstring profile = importer_list_->GetSourceProfileNameAt(i);
-      gtk_combo_box_append_text(GTK_COMBO_BOX(combo_),
-                                WideToUTF8(profile).c_str());
-    }
-    gtk_widget_grab_focus(import_button_);
-  } else {
-    gtk_combo_box_append_text(GTK_COMBO_BOX(combo_),
-      l10n_util::GetStringUTF8(IDS_IMPORT_NO_PROFILE_FOUND).c_str());
-  }
-  gtk_combo_box_set_active(GTK_COMBO_BOX(combo_), 0);
-}
-
-void ImportDialogGtk::ImportCompleted() {
-  gtk_widget_destroy(dialog_);
-  delete this;
-}
-
-void ImportDialogGtk::ImportCanceled() {
-  ImportCompleted();
-}
diff --git a/chrome/browser/ui/gtk/importer/import_dialog_gtk.h b/chrome/browser/ui/gtk/importer/import_dialog_gtk.h
deleted file mode 100644
index 136b74e..0000000
--- a/chrome/browser/ui/gtk/importer/import_dialog_gtk.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_GTK_IMPORTER_IMPORT_DIALOG_GTK_H_
-#define CHROME_BROWSER_UI_GTK_IMPORTER_IMPORT_DIALOG_GTK_H_
-#pragma once
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/ref_counted.h"
-#include "chrome/browser/importer/importer_list.h"
-#include "chrome/browser/importer/importer_observer.h"
-#include "ui/base/gtk/gtk_signal.h"
-
-class ImporterHost;
-class Profile;
-
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkWindow GtkWindow;
-
-// ImportDialogGtk presents the dialog that allows the user to select what to
-// import from other browsers.
-class ImportDialogGtk : public ImporterList::Observer,
-                        public ImporterObserver {
- public:
-  // Displays the import box to import data from another browser into |profile|.
-  // |initial_state| is a bitmask of importer::ImportItem.
-  // Each checkbox for the bits in |initial_state| is checked.
-  static void Show(GtkWindow* parent, Profile* profile, uint16 initial_state);
-
- private:
-  ImportDialogGtk(GtkWindow* parent, Profile* profile, uint16 initial_state);
-  virtual ~ImportDialogGtk();
-
-  // Handler to respond to OK or Cancel responses from the dialog.
-  CHROMEGTK_CALLBACK_1(ImportDialogGtk, void, OnResponse, int);
-
-  // Handler to respond to widget clicked actions from the dialog.
-  CHROMEGTK_CALLBACK_0(ImportDialogGtk, void, OnDialogWidgetClicked);
-
-  // Enable or disable the dialog buttons depending on the state of the
-  // checkboxes.
-  void UpdateDialogButtons();
-
-  // Sets the sensitivity of all controls on the dialog except the cancel
-  // button.
-  void SetDialogControlsSensitive(bool sensitive);
-
-  // Create a bitmask from the checkboxes of the dialog.
-  uint16 GetCheckedItems();
-
-  // ImporterList::Observer:
-  virtual void SourceProfilesLoaded() OVERRIDE;
-
-  // ImporterObserver:
-  virtual void ImportCompleted() OVERRIDE;
-  virtual void ImportCanceled() OVERRIDE;
-
-  // Parent window
-  GtkWindow* parent_;
-
-  // Import Dialog
-  GtkWidget* dialog_;
-
-  // Combo box that displays list of profiles from which we can import.
-  GtkWidget* combo_;
-
-  // Bookmarks/Favorites checkbox
-  GtkWidget* bookmarks_;
-
-  // Search Engines checkbox
-  GtkWidget* search_engines_;
-
-  // Passwords checkbox
-  GtkWidget* passwords_;
-
-  // History checkbox
-  GtkWidget* history_;
-
-  // Import button.
-  GtkWidget* import_button_;
-
-  // Our current profile
-  Profile* profile_;
-
-  // Utility class that does the actual import.
-  scoped_refptr<ImporterHost> importer_host_;
-
-  // Enumerates the source profiles.
-  scoped_refptr<ImporterList> importer_list_;
-
-  // Initial state of the |checkbox_items_|.
-  uint16 initial_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(ImportDialogGtk);
-};
-
-#endif  // CHROME_BROWSER_UI_GTK_IMPORTER_IMPORT_DIALOG_GTK_H_
diff --git a/chrome/browser/ui/views/importer/import_dialog_view.cc b/chrome/browser/ui/views/importer/import_dialog_view.cc
deleted file mode 100644
index ef7b49c..0000000
--- a/chrome/browser/ui/views/importer/import_dialog_view.cc
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/importer/import_dialog_view.h"
-
-#include "base/compiler_specific.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_list.h"
-#include "chrome/browser/browser_window.h"
-#include "chrome/browser/importer/importer_data_types.h"
-#include "chrome/browser/importer/importer_list.h"
-#include "chrome/browser/importer/importer_progress_dialog.h"
-#include "grit/generated_resources.h"
-#include "grit/locale_settings.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "views/controls/button/checkbox.h"
-#include "views/controls/label.h"
-#include "views/layout/grid_layout.h"
-#include "views/layout/layout_constants.h"
-#include "views/widget/widget.h"
-#include "views/window/window.h"
-
-using views::ColumnSet;
-using views::GridLayout;
-
-ImportDialogView::ImportDialogView(Profile* profile, uint16 initial_state)
-    : import_from_label_(NULL),
-      profile_combobox_(NULL),
-      import_items_label_(NULL),
-      history_checkbox_(NULL),
-      favorites_checkbox_(NULL),
-      passwords_checkbox_(NULL),
-      search_engines_checkbox_(NULL),
-      profile_(profile),
-      importer_host_(new ImporterHost),
-      importer_list_(new ImporterList),
-      initial_state_(initial_state) {
-  DCHECK(profile);
-  importer_list_->DetectSourceProfiles(this);
-  SetupControl();
-}
-
-ImportDialogView::~ImportDialogView() {
-  if (importer_list_)
-    importer_list_->SetObserver(NULL);
-}
-
-gfx::Size ImportDialogView::GetPreferredSize() {
-  return gfx::Size(views::Window::GetLocalizedContentsSize(
-      IDS_IMPORT_DIALOG_WIDTH_CHARS,
-      IDS_IMPORT_DIALOG_HEIGHT_LINES));
-}
-
-void ImportDialogView::Layout() {
-  GetLayoutManager()->Layout(this);
-}
-
-std::wstring ImportDialogView::GetDialogButtonLabel(
-    MessageBoxFlags::DialogButton button) const {
-  if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_COMMIT));
-  } else {
-    return std::wstring();
-  }
-}
-
-bool ImportDialogView::IsDialogButtonEnabled(
-    MessageBoxFlags::DialogButton button) const {
-  if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return history_checkbox_->checked() ||
-           favorites_checkbox_->checked() ||
-           passwords_checkbox_->checked() ||
-           search_engines_checkbox_->checked();
-  }
-
-  return true;
-}
-
-bool ImportDialogView::IsModal() const {
-  return true;
-}
-
-std::wstring ImportDialogView::GetWindowTitle() const {
-  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_SETTINGS_TITLE));
-}
-
-bool ImportDialogView::Accept() {
-  if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK))
-    return false;
-
-  int selected_index = profile_combobox_->selected_item();
-  importer::ShowImportProgressDialog(
-      GetWidget()->GetNativeView(),
-      GetCheckedItems(),
-      importer_host_.get(),
-      this,
-      importer_list_->GetSourceProfileInfoAt(selected_index),
-      profile_,
-      false);
-
-  // We return false here to prevent the window from being closed. We will be
-  // notified back by our implementation of ImporterObserver when the import is
-  // complete so that we can close ourselves.
-  return false;
-}
-
-views::View* ImportDialogView::GetContentsView() {
-  return this;
-}
-
-void ImportDialogView::ButtonPressed(
-    views::Button* sender, const views::Event& event) {
-  // When no checkbox is checked we should disable the "Import" button.
-  // This forces the button to evaluate what state they should be in.
-  GetDialogClientView()->UpdateDialogButtons();
-}
-
-int ImportDialogView::GetItemCount() {
-  DCHECK(importer_host_.get());
-  return checkbox_items_.size();
-}
-
-string16 ImportDialogView::GetItemAt(int index) {
-  DCHECK(importer_host_.get());
-
-  if (!importer_list_->source_profiles_loaded())
-    return l10n_util::GetStringUTF16(IDS_IMPORT_LOADING_PROFILES);
-  else
-    return WideToUTF16Hack(importer_list_->GetSourceProfileNameAt(index));
-}
-
-void ImportDialogView::ItemChanged(views::Combobox* combobox,
-                               int prev_index, int new_index) {
-  DCHECK(combobox);
-  DCHECK(checkbox_items_.size() >=
-      static_cast<size_t>(importer_list_->GetAvailableProfileCount()));
-
-  if (prev_index == new_index)
-    return;
-
-  if (!importer_list_->source_profiles_loaded()) {
-    SetCheckedItemsState(0);
-    return;
-  }
-
-  // Save the current state
-  uint16 prev_items = GetCheckedItems();
-  checkbox_items_[prev_index] = prev_items;
-
-  // Enable/Disable the checkboxes for this Item
-  uint16 new_enabled_items = importer_list_->GetSourceProfileInfoAt(
-      new_index).services_supported;
-  SetCheckedItemsState(new_enabled_items);
-
-  // Set the checked items for this Item
-  uint16 new_items = checkbox_items_[new_index];
-  SetCheckedItems(new_items);
-}
-
-void ImportDialogView::SetupControl() {
-  // Adds all controls.
-  import_from_label_ = new views::Label(UTF16ToWide(
-      l10n_util::GetStringUTF16(IDS_IMPORT_FROM_LABEL)));
-
-  profile_combobox_ = new views::Combobox(this);
-  profile_combobox_->set_listener(this);
-  profile_combobox_->SetAccessibleName(
-      WideToUTF16Hack(import_from_label_->GetText()));
-
-  import_items_label_ = new views::Label(UTF16ToWide(
-      l10n_util::GetStringUTF16(IDS_IMPORT_ITEMS_LABEL)));
-
-  history_checkbox_ = InitCheckbox(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_HISTORY_CHKBOX)),
-      (initial_state_ & importer::HISTORY) != 0);
-  favorites_checkbox_ = InitCheckbox(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_FAVORITES_CHKBOX)),
-      (initial_state_ & importer::FAVORITES) != 0);
-  passwords_checkbox_ = InitCheckbox(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_PASSWORDS_CHKBOX)),
-      (initial_state_ & importer::PASSWORDS) != 0);
-  search_engines_checkbox_ = InitCheckbox(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_SEARCH_ENGINES_CHKBOX)),
-      (initial_state_ & importer::SEARCH_ENGINES) != 0);
-
-  // Arranges controls by using GridLayout.
-  const int column_set_id = 0;
-  GridLayout* layout = GridLayout::CreatePanel(this);
-  SetLayoutManager(layout);
-  ColumnSet* column_set = layout->AddColumnSet(column_set_id);
-  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
-                        GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
-  column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
-                        GridLayout::FIXED, 200, 0);
-
-  layout->StartRow(0, column_set_id);
-  layout->AddView(import_from_label_);
-  layout->AddView(profile_combobox_);
-
-  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
-  layout->StartRow(0, column_set_id);
-  layout->AddView(import_items_label_, 3, 1);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-  layout->StartRow(0, column_set_id);
-  layout->AddView(favorites_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-  layout->StartRow(0, column_set_id);
-  layout->AddView(search_engines_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-  layout->StartRow(0, column_set_id);
-  layout->AddView(passwords_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-  layout->StartRow(0, column_set_id);
-  layout->AddView(history_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-}
-
-views::Checkbox* ImportDialogView::InitCheckbox(const std::wstring& text,
-                                                bool checked) {
-  views::Checkbox* checkbox = new views::Checkbox(text);
-  checkbox->SetChecked(checked);
-  checkbox->set_listener(this);
-  return checkbox;
-}
-
-uint16 ImportDialogView::GetCheckedItems() {
-  uint16 items = importer::NONE;
-  if (history_checkbox_->IsEnabled() && history_checkbox_->checked())
-    items |= importer::HISTORY;
-  if (favorites_checkbox_->IsEnabled() && favorites_checkbox_->checked())
-    items |= importer::FAVORITES;
-  if (passwords_checkbox_->IsEnabled() && passwords_checkbox_->checked())
-    items |= importer::PASSWORDS;
-  if (search_engines_checkbox_->IsEnabled() &&
-      search_engines_checkbox_->checked())
-    items |= importer::SEARCH_ENGINES;
-  return items;
-}
-
-void ImportDialogView::SetCheckedItemsState(uint16 items) {
-  if (items & importer::HISTORY) {
-    history_checkbox_->SetEnabled(true);
-  } else {
-    history_checkbox_->SetEnabled(false);
-    history_checkbox_->SetChecked(false);
-  }
-  if (items & importer::FAVORITES) {
-    favorites_checkbox_->SetEnabled(true);
-  } else {
-    favorites_checkbox_->SetEnabled(false);
-    favorites_checkbox_->SetChecked(false);
-  }
-  if (items & importer::PASSWORDS) {
-    passwords_checkbox_->SetEnabled(true);
-  } else {
-    passwords_checkbox_->SetEnabled(false);
-    passwords_checkbox_->SetChecked(false);
-  }
-  if (items & importer::SEARCH_ENGINES) {
-    search_engines_checkbox_->SetEnabled(true);
-  } else {
-    search_engines_checkbox_->SetEnabled(false);
-    search_engines_checkbox_->SetChecked(false);
-  }
-}
-
-void ImportDialogView::SetCheckedItems(uint16 items) {
-  if (history_checkbox_->IsEnabled())
-    history_checkbox_->SetChecked(!!(items & importer::HISTORY));
-
-  if (favorites_checkbox_->IsEnabled())
-    favorites_checkbox_->SetChecked(!!(items & importer::FAVORITES));
-
-  if (passwords_checkbox_->IsEnabled())
-    passwords_checkbox_->SetChecked(!!(items & importer::PASSWORDS));
-
-  if (search_engines_checkbox_->IsEnabled())
-    search_engines_checkbox_->SetChecked(!!(items & importer::SEARCH_ENGINES));
-}
-
-void ImportDialogView::SourceProfilesLoaded() {
-  DCHECK(importer_list_->source_profiles_loaded());
-  checkbox_items_.resize(
-      importer_list_->GetAvailableProfileCount(), initial_state_);
-
-  // Reload the profile combobox.
-  profile_combobox_->ModelChanged();
-}
-
-void ImportDialogView::ImportCompleted() {
-  // Now close this window since the import completed or was canceled.
-  window()->CloseWindow();
-}
-
-void ImportDialogView::ImportCanceled() {
-  ImportCompleted();
-}
diff --git a/chrome/browser/ui/views/importer/import_dialog_view.h b/chrome/browser/ui/views/importer/import_dialog_view.h
deleted file mode 100644
index 1a5ec93..0000000
--- a/chrome/browser/ui/views/importer/import_dialog_view.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_DIALOG_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_DIALOG_VIEW_H_
-#pragma once
-
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/ref_counted.h"
-#include "base/string16.h"
-#include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/importer/importer_observer.h"
-#include "ui/base/models/combobox_model.h"
-#include "views/controls/button/native_button.h"
-#include "views/controls/combobox/combobox.h"
-#include "views/view.h"
-#include "views/window/dialog_delegate.h"
-
-namespace views {
-class Checkbox;
-class Label;
-class Window;
-}
-
-class ImporterList;
-class Profile;
-
-// ImportDialogView draws the dialog that allows the user to select what to
-// import from other browsers.
-class ImportDialogView : public views::View,
-                         public views::DialogDelegate,
-                         public views::ButtonListener,
-                         public ui::ComboboxModel,
-                         public views::Combobox::Listener,
-                         public ImporterList::Observer,
-                         public ImporterObserver {
- public:
-  // |initial_state| is a bitmask of importer::ImportItem.
-  // Each checkbox for the bits in |initial_state| is checked.
-  ImportDialogView(Profile* profile, uint16 initial_state);
-  virtual ~ImportDialogView();
-
- protected:
-  // views::View:
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual void Layout() OVERRIDE;
-
-  // views::DialogDelegate:
-  virtual std::wstring GetDialogButtonLabel(
-      MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(
-      MessageBoxFlags::DialogButton button) const OVERRIDE;
-  virtual bool IsModal() const OVERRIDE;
-  virtual std::wstring GetWindowTitle() const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual views::View* GetContentsView() OVERRIDE;
-
-  // views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const views::Event& event) OVERRIDE;
-
-  // ui::ComboboxModel:
-  virtual int GetItemCount();
-  virtual string16 GetItemAt(int index) OVERRIDE;
-
-  // views::Combobox::Listener
-  virtual void ItemChanged(views::Combobox* combobox,
-                           int prev_index,
-                           int new_index) OVERRIDE;
-
- private:
-  // Initializes the controls on the dialog.
-  void SetupControl();
-
-  // Creates and initializes a new check-box.
-  views::Checkbox* InitCheckbox(const std::wstring& text, bool checked);
-
-  // Create a bitmap from the checkboxes of the view.
-  uint16 GetCheckedItems();
-
-  // Enables/Disables all the checked items for the given state.
-  void SetCheckedItemsState(uint16 items);
-
-  // Sets all checked items in the given state.
-  void SetCheckedItems(uint16 items);
-
-  // ImporterList::Observer:
-  virtual void SourceProfilesLoaded() OVERRIDE;
-
-  // ImporterObserver:
-  virtual void ImportCompleted() OVERRIDE;
-  virtual void ImportCanceled() OVERRIDE;
-
-  views::Label* import_from_label_;
-  views::Combobox* profile_combobox_;
-  views::Label* import_items_label_;
-  views::Checkbox* history_checkbox_;
-  views::Checkbox* favorites_checkbox_;
-  views::Checkbox* passwords_checkbox_;
-  views::Checkbox* search_engines_checkbox_;
-
-  // Our current profile.
-  Profile* profile_;
-
-  // Utility class that does the actual import.
-  scoped_refptr<ImporterHost> importer_host_;
-
-  // Enumerates the source profiles.
-  scoped_refptr<ImporterList> importer_list_;
-
-  // Stores the state of the checked items associated with the position of the
-  // selected item in the combo-box.
-  std::vector<uint16> checkbox_items_;
-
-  // Initial state of the |checkbox_items_|.
-  uint16 initial_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(ImportDialogView);
-};
-
-#endif  // CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_DIALOG_VIEW_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index eadddd4..0e4c47b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2299,8 +2299,6 @@
         'browser/ui/cocoa/hyperlink_button_cell.mm',
         'browser/ui/cocoa/image_utils.h',
         'browser/ui/cocoa/image_utils.mm',
-        'browser/ui/cocoa/importer/import_dialog_cocoa.h',
-        'browser/ui/cocoa/importer/import_dialog_cocoa.mm',
         'browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm',
         'browser/ui/cocoa/importer/import_progress_dialog_cocoa.h',
         'browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm',
@@ -2613,8 +2611,6 @@
         'browser/ui/gtk/html_dialog_gtk.cc',
         'browser/ui/gtk/html_dialog_gtk.h',
         'browser/ui/gtk/hung_renderer_dialog_gtk.cc',
-        'browser/ui/gtk/importer/import_dialog_gtk.cc',
-        'browser/ui/gtk/importer/import_dialog_gtk.h',
         'browser/ui/gtk/importer/import_lock_dialog_gtk.cc',
         'browser/ui/gtk/importer/import_lock_dialog_gtk.h',
         'browser/ui/gtk/importer/import_progress_dialog_gtk.cc',
@@ -2922,8 +2918,6 @@
         'browser/ui/views/html_dialog_view.cc',
         'browser/ui/views/html_dialog_view.h',
         'browser/ui/views/hung_renderer_view.cc',
-        'browser/ui/views/importer/import_dialog_view.cc',
-        'browser/ui/views/importer/import_dialog_view.h',
         'browser/ui/views/importer/import_lock_dialog_view.cc',
         'browser/ui/views/importer/import_lock_dialog_view.h',
         'browser/ui/views/importer/import_progress_dialog_view.cc',
@@ -3577,7 +3571,6 @@
                   'app/nibs/HttpAuthLoginSheet.xib',
                   'app/nibs/HungRendererDialog.xib',
                   'app/nibs/ImportProgressDialog.xib',
-                  'app/nibs/ImportSettingsDialog.xib',
                   'app/nibs/InstantOptIn.xib',
                   'app/nibs/MainMenu.xib',
                   'app/nibs/ReportBug.xib',
@@ -3727,8 +3720,6 @@
                 ['include', '^browser/ui/gtk/hover_controller_gtk.cc'],
                 ['include', '^browser/ui/gtk/hover_controller_gtk.h'],
                 ['include', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/importer/import_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/importer/import_dialog_gtk.h'],
                 ['include', '^browser/ui/gtk/importer/import_lock_dialog_gtk.cc'],
                 ['include', '^browser/ui/gtk/importer/import_lock_dialog_gtk.h'],
                 ['include', '^browser/ui/gtk/importer/import_progress_dialog_gtk.cc'],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index eb35f68..43b729e 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -224,7 +224,6 @@
                 'app/nibs/HungRendererDialog.xib',
                 'app/nibs/HttpAuthLoginSheet.xib',
                 'app/nibs/ImportProgressDialog.xib',
-                'app/nibs/ImportSettingsDialog.xib',
                 'app/nibs/InfoBar.xib',
                 'app/nibs/InfoBarContainer.xib',
                 'app/nibs/InstantOptIn.xib',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 23b364b..e18115e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1610,7 +1610,6 @@
         'browser/ui/cocoa/hung_renderer_controller_unittest.mm',
         'browser/ui/cocoa/hyperlink_button_cell_unittest.mm',
         'browser/ui/cocoa/image_utils_unittest.mm',
-        'browser/ui/cocoa/importer/import_dialog_cocoa_unittest.mm',
         'browser/ui/cocoa/info_bubble_view_unittest.mm',
         'browser/ui/cocoa/info_bubble_window_unittest.mm',
         'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm',