Import dialog fixup:

- use one call string convert
- load the nib from the main bundle
- make the cancel button autosize to it's string
- make the cancel button tweak it's position based on the string (not dialog position, but keep the right edge as is)
- fix up some field overlaps, and position, dialog still isn't pretty, but this is how Cole said to leave it rather then reopen the discussion now.
- use the WithFixup helpers to deal with ellipses 

TEST=button fits text, fields don't overlap any strings.
BUG=20534
Review URL: http://codereview.chromium.org/235055

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

1 files changed, 147 insertions, 60 deletions

diff --git a/chrome/app/nibs/ImportProgressDialog.xib b/chrome/app/nibs/ImportProgressDialog.xib
index 81bcd95..eea8740 100644
--- a/chrome/app/nibs/ImportProgressDialog.xib
+++ b/chrome/app/nibs/ImportProgressDialog.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9L31a</string>
+		<string key="IBDocument.SystemVersion">9L30</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
 		<string key="IBDocument.AppKitVersion">949.54</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
@@ -37,7 +37,7 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 316}, {509, 194}}</string>
+				<string key="NSWindowRect">{{196, 308}, {508, 202}}</string>
 				<int key="NSWTFlags">536871936</int>
 				<string key="NSWindowTitle">^IDS_IMPORT_PROGRESS_TITLE</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -51,13 +51,13 @@
 						<object class="NSTextField" id="720286696">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 157}, {475, 17}}</string>
+							<string key="NSFrame">{{17, 165}, {475, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="131310306">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Google Chrome is now importing the following items from Mozilla Firefox:</string>
+								<string key="NSContents">summary</string>
 								<object class="NSFont" key="NSSupport" id="521946663">
 									<string key="NSName">LucidaGrande</string>
 									<double key="NSSize">1.300000e+01</double>
@@ -87,7 +87,7 @@
 						<object class="NSTextField" id="310539509">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{29, 48}, {234, 17}}</string>
+							<string key="NSFrame">{{29, 56}, {227, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="958179589">
@@ -103,7 +103,7 @@
 						<object class="NSTextField" id="423545563">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{29, 98}, {234, 17}}</string>
+							<string key="NSFrame">{{29, 106}, {227, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="378152902">
@@ -119,7 +119,7 @@
 						<object class="NSTextField" id="1056899072">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{29, 73}, {234, 17}}</string>
+							<string key="NSFrame">{{29, 81}, {227, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="848132906">
@@ -135,7 +135,7 @@
 						<object class="NSTextField" id="891861620">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{29, 123}, {234, 17}}</string>
+							<string key="NSFrame">{{29, 131}, {227, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="858790319">
@@ -148,36 +148,16 @@
 								<reference key="NSTextColor" ref="488269303"/>
 							</object>
 						</object>
-						<object class="NSButton" id="487067694">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{370, 4}, {96, 32}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="190897395">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">^IDS_CANCEL</string>
-								<reference key="NSSupport" ref="521946663"/>
-								<reference key="NSControlView" ref="487067694"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
 						<object class="NSTextField" id="784027825">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{201, 48}, {234, 17}}</string>
+							<string key="NSFrame">{{258, 56}, {234, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="611550854">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Label</string>
+								<string key="NSContents">status</string>
 								<object class="NSFont" key="NSSupport" id="637535423">
 									<string key="NSName">LucidaGrande-Bold</string>
 									<double key="NSSize">1.300000e+01</double>
@@ -191,13 +171,13 @@
 						<object class="NSTextField" id="103622856">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{201, 73}, {234, 17}}</string>
+							<string key="NSFrame">{{258, 81}, {234, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="647121178">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Label</string>
+								<string key="NSContents">status</string>
 								<reference key="NSSupport" ref="637535423"/>
 								<reference key="NSControlView" ref="103622856"/>
 								<reference key="NSBackgroundColor" ref="209012800"/>
@@ -207,13 +187,13 @@
 						<object class="NSTextField" id="717472336">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{201, 98}, {234, 17}}</string>
+							<string key="NSFrame">{{258, 106}, {234, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="960052984">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Label</string>
+								<string key="NSContents">status</string>
 								<reference key="NSSupport" ref="637535423"/>
 								<reference key="NSControlView" ref="717472336"/>
 								<reference key="NSBackgroundColor" ref="209012800"/>
@@ -223,21 +203,51 @@
 						<object class="NSTextField" id="489328383">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{201, 123}, {234, 17}}</string>
+							<string key="NSFrame">{{258, 131}, {234, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="929811185">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Label</string>
+								<string key="NSContents">status</string>
 								<reference key="NSSupport" ref="637535423"/>
 								<reference key="NSControlView" ref="489328383"/>
 								<reference key="NSBackgroundColor" ref="209012800"/>
 								<reference key="NSTextColor" ref="488269303"/>
 							</object>
 						</object>
+						<object class="NSCustomView" id="745871671">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">289</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSButton" id="487067694">
+									<reference key="NSNextResponder" ref="745871671"/>
+									<int key="NSvFlags">289</int>
+									<string key="NSFrame">{{14, 12}, {96, 32}}</string>
+									<reference key="NSSuperview" ref="745871671"/>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSButtonCell" key="NSCell" id="190897395">
+										<int key="NSCellFlags">67239424</int>
+										<int key="NSCellFlags2">134217728</int>
+										<string key="NSContents">^IDS_CANCEL</string>
+										<reference key="NSSupport" ref="521946663"/>
+										<reference key="NSControlView" ref="487067694"/>
+										<int key="NSButtonFlags">-2038284033</int>
+										<int key="NSButtonFlags2">129</int>
+										<string key="NSAlternateContents"/>
+										<string key="NSKeyEquivalent"/>
+										<int key="NSPeriodicDelay">200</int>
+										<int key="NSPeriodicInterval">25</int>
+									</object>
+								</object>
+							</object>
+							<string key="NSFrame">{{356, 0}, {124, 48}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<string key="NSClassName">GTMWidthBasedTweaker</string>
+						</object>
 					</object>
-					<string key="NSFrameSize">{509, 194}</string>
+					<string key="NSFrameSize">{508, 202}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -246,6 +256,9 @@
 			<object class="NSCustomObject" id="695534214">
 				<string key="NSClassName">ChromeUILocalizer</string>
 			</object>
+			<object class="NSCustomObject" id="882117346">
+				<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -412,11 +425,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">owner_</string>
-						<reference key="source" ref="695534214"/>
-						<reference key="destination" ref="1001"/>
+						<string key="label">localizer_</string>
+						<reference key="source" ref="882117346"/>
+						<reference key="destination" ref="695534214"/>
+					</object>
+					<int key="connectionID">60</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">uiObject_</string>
+						<reference key="source" ref="882117346"/>
+						<reference key="destination" ref="1005"/>
 					</object>
-					<int key="connectionID">58</int>
+					<int key="connectionID">61</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -467,11 +488,11 @@
 							<reference ref="423545563"/>
 							<reference ref="1056899072"/>
 							<reference ref="891861620"/>
-							<reference ref="487067694"/>
+							<reference ref="784027825"/>
 							<reference ref="103622856"/>
 							<reference ref="717472336"/>
-							<reference ref="784027825"/>
 							<reference ref="489328383"/>
+							<reference ref="745871671"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -546,20 +567,6 @@
 						<reference key="parent" ref="891861620"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="487067694"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="190897395"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="190897395"/>
-						<reference key="parent" ref="487067694"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">16</int>
 						<reference key="object" ref="784027825"/>
 						<object class="NSMutableArray" key="children">
@@ -620,6 +627,34 @@
 						<reference key="object" ref="695534214"/>
 						<reference key="parent" ref="1002"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="882117346"/>
+						<reference key="parent" ref="1002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">62</int>
+						<reference key="object" ref="745871671"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="487067694"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="487067694"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="190897395"/>
+						</object>
+						<reference key="parent" ref="745871671"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="190897395"/>
+						<reference key="parent" ref="487067694"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -653,6 +688,7 @@
 					<string>4.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
 					<string>57.IBPluginDependency</string>
+					<string>59.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
@@ -663,9 +699,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{792, 559}, {509, 194}}</string>
+					<string>{{792, 551}, {508, 202}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{792, 559}, {509, 194}}</string>
+					<string>{{792, 551}, {508, 202}}</string>
 					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
@@ -691,6 +727,7 @@
 					<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">
@@ -713,7 +750,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">58</int>
+			<int key="maxID">62</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -750,6 +787,49 @@
 					</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="NSMutableArray" 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="IBClassDescriptionSource" key="sourceIdentifier" id="897988839">
+						<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="NSMutableArray" 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>
+					<reference key="sourceIdentifier" ref="897988839"/>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">ImportProgressDialogController</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
@@ -775,6 +855,13 @@
 						<string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/nswindow_local_state.h</string>
+					</object>
+				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>