diff --git a/DEPS b/DEPS
index 884e72afbe3fa4386f702fa990c48aec80fc05f1..223d76c54ea5b100a3cb3be13d067441a78c3c75 100644
--- a/DEPS
+++ b/DEPS
@@ -122,7 +122,7 @@ deps_os = {
},
"mac": {
"src/third_party/GTM":
- "http://google-toolbox-for-mac.googlecode.com/svn/trunk@230",
+ "http://google-toolbox-for-mac.googlecode.com/svn/trunk@240",
"src/third_party/pdfsqueeze":
"http://pdfsqueeze.googlecode.com/svn/trunk@2",
"src/third_party/WebKit/WebKit/mac":
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index ec9ca48e28919dae8e197bef14544441a8067940..dd5f662ddc20b154a33854eaa2bf5f2aef72f5f7 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -9,8 +9,6 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="3"/>
- <integer value="481"/>
- <integer value="483"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -727,151 +725,16 @@
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTextField" id="188533588">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{271, 207}, {176, 22}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="771835631">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="188533588"/>
- <bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="571857138">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textColor</string>
- <reference key="NSColor" ref="28651200"/>
- </object>
- </object>
- </object>
- <object class="NSButton" id="810089388">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{249, 276}, {198, 23}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="788559409">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">^IDS_OPTIONS_STARTUP_USE_CURRENT</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="810089388"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">162</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- </object>
- <object class="NSButton" id="909713979">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{147, 276}, {52, 23}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="709698869">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="909713979"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">162</int>
- <object class="NSCustomResource" key="NSNormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSAddTemplate</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- </object>
- <object class="NSButton" id="940065158">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{198, 276}, {52, 23}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="517413682">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="940065158"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">162</int>
- <object class="NSCustomResource" key="NSNormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSRemoveTemplate</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- </object>
- <object class="NSTextField" id="881113898">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 155}, {123, 17}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="519689237">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">^IDS_OPTIONS_TOOLBAR_GROUP_NAME</string>
- <reference key="NSSupport" ref="290273273"/>
- <reference key="NSControlView" ref="881113898"/>
- <reference key="NSBackgroundColor" ref="592613688"/>
- <reference key="NSTextColor" ref="748094473"/>
- </object>
- </object>
- <object class="NSButton" id="136601899">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{145, 154}, {236, 18}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="131780438">
- <int key="NSCellFlags">-1543373312</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_SHOW_BUTTON</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="136601899"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="124073107"/>
- <reference key="NSAlternateImage" ref="927168675"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSTextField" id="325467010">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 413}, {123, 17}}</string>
+ <string key="NSFrame">{{17, 310}, {148, 150}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="542921234">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">^IDS_OPTIONS_STARTUP_GROUP_NAME</string>
<reference key="NSSupport" ref="290273273"/>
<reference key="NSControlView" ref="325467010"/>
@@ -882,8 +745,9 @@
<object class="NSMatrix" id="1016627403">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{147, 369}, {300, 61}}</string>
+ <string key="NSFrame">{{172, 402}, {378, 58}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">3</int>
<int key="NSNumCols">1</int>
@@ -1142,7 +1006,7 @@ rwAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4sIDIwMDkAA</bytes
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <string key="NSCellSize">{300, 19}</string>
+ <string key="NSCellSize">{378, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
<int key="NSMatrixFlags">1151868928</int>
<string key="NSCellClass">NSActionCell</string>
@@ -1200,92 +1064,301 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<reference key="NSSelectedCell" ref="866030183"/>
<reference key="NSBackgroundColor" ref="592613688"/>
- <reference key="NSCellBackgroundColor" ref="571857138"/>
+ <object class="NSColor" key="NSCellBackgroundColor" id="571857138">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
<reference key="NSFont" ref="445696277"/>
</object>
- <object class="NSButton" id="306778908">
+ <object class="NSButton" id="810089388">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{145, 131}, {311, 18}}</string>
+ <string key="NSFrame">{{274, 309}, {205, 23}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="114177510">
- <int key="NSCellFlags">-1543373312</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_OPTIONS_PAGE_OPTION_SHOW_BUTTON</string>
+ <object class="NSButtonCell" key="NSCell" id="788559409">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_OPTIONS_STARTUP_USE_CURRENT</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="306778908"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="124073107"/>
- <reference key="NSAlternateImage" ref="927168675"/>
+ <reference key="NSControlView" ref="810089388"/>
+ <int key="NSButtonFlags">-2033434369</int>
+ <int key="NSButtonFlags2">162</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSTextField" id="982570975">
+ <object class="NSButton" id="940065158">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 230}, {123, 17}}</string>
+ <string key="NSFrame">{{223, 309}, {52, 23}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="901046858">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_GROUP_NAME</string>
- <reference key="NSSupport" ref="290273273"/>
- <reference key="NSControlView" ref="982570975"/>
- <reference key="NSBackgroundColor" ref="592613688"/>
- <reference key="NSTextColor" ref="748094473"/>
+ <object class="NSButtonCell" key="NSCell" id="517413682">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="940065158"/>
+ <int key="NSButtonFlags">-2033434369</int>
+ <int key="NSButtonFlags2">162</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSRemoveTemplate</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSMatrix" id="743261621">
+ <object class="NSButton" id="909713979">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{147, 207}, {300, 40}}</string>
+ <string key="NSFrame">{{172, 309}, {52, 23}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <int key="NSNumRows">2</int>
- <int key="NSNumCols">1</int>
- <object class="NSMutableArray" key="NSCells">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButtonCell" id="182948450">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_USE_NEWTAB</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="743261621"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">128</int>
- <reference key="NSAlternateImage" ref="1028460734"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
+ <object class="NSButtonCell" key="NSCell" id="709698869">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="909713979"/>
+ <int key="NSButtonFlags">-2033434369</int>
+ <int key="NSButtonFlags2">162</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSAddTemplate</string>
</object>
- <object class="NSButtonCell" id="1001736883">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_USE_URL</string>
- <reference key="NSSupport" ref="445696277"/>
- <int key="NSTag">1</int>
- <reference key="NSControlView" ref="743261621"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">128</int>
- <object class="NSImage" key="NSNormalImage">
- <int key="NSImageFlags">549453824</int>
- <string key="NSSize">{18, 18}</string>
- <object class="NSMutableArray" key="NSReps">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray">
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ </object>
+ <object class="NSScrollView" id="54854923">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSClipView" id="570210247">
+ <reference key="NSNextResponder" ref="54854923"/>
+ <int key="NSvFlags">2304</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTableView" id="165250101">
+ <reference key="NSNextResponder" ref="570210247"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{305, 63}</string>
+ <reference key="NSSuperview" ref="570210247"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="_NSCornerView" key="NSCornerView">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+ </object>
+ <object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="8"/>
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+ <object class="NSTableColumn" id="1005813658">
+ <double key="NSWidth">3.020000e+02</double>
+ <double key="NSMinWidth">4.000000e+01</double>
+ <double key="NSMaxWidth">1.000000e+03</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.100000e+01</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+ </object>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">headerTextColor</string>
+ <reference key="NSColor" ref="28651200"/>
+ </object>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="261581009">
+ <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags2">133120</int>
+ <string key="NSContents">Text Cell</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="165250101"/>
+ <object class="NSColor" key="NSBackgroundColor" id="452188023">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlBackgroundColor</string>
+ <reference key="NSColor" ref="854057974"/>
+ </object>
+ <reference key="NSTextColor" ref="748094473"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <bool key="NSIsEditable">YES</bool>
+ <reference key="NSTableView" ref="165250101"/>
+ </object>
+ </object>
+ <double key="NSIntercellSpacingWidth">3.000000e+00</double>
+ <double key="NSIntercellSpacingHeight">2.000000e+00</double>
+ <reference key="NSBackgroundColor" ref="571857138"/>
+ <object class="NSColor" key="NSGridColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">gridColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <double key="NSRowHeight">1.700000e+01</double>
+ <int key="NSTvFlags">-901775360</int>
+ <int key="NSColumnAutoresizingStyle">4</int>
+ <int key="NSDraggingSourceMaskForLocal">15</int>
+ <int key="NSDraggingSourceMaskForNonLocal">0</int>
+ <bool key="NSAllowsTypeSelect">YES</bool>
+ </object>
+ </object>
+ <string key="NSFrame">{{1, 1}, {305, 63}}</string>
+ <reference key="NSSuperview" ref="54854923"/>
+ <reference key="NSWindow"/>
+ <reference key="NSDocView" ref="165250101"/>
+ <reference key="NSBGColor" ref="452188023"/>
+ <int key="NScvFlags">4</int>
+ </object>
+ <object class="NSScroller" id="895676258">
+ <reference key="NSNextResponder" ref="54854923"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{272, 1}, {11, 63}}</string>
+ <reference key="NSSuperview" ref="54854923"/>
+ <reference key="NSWindow"/>
+ <int key="NSsFlags">256</int>
+ <reference key="NSTarget" ref="54854923"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">9.868421e-01</double>
+ </object>
+ <object class="NSScroller" id="757862790">
+ <reference key="NSNextResponder" ref="54854923"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {267, 15}}</string>
+ <reference key="NSSuperview" ref="54854923"/>
+ <reference key="NSWindow"/>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="54854923"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">5.714286e-01</double>
+ </object>
+ </object>
+ <string key="NSFrame">{{172, 329}, {307, 65}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <int key="NSsFlags">530</int>
+ <reference key="NSVScroller" ref="895676258"/>
+ <reference key="NSHScroller" ref="757862790"/>
+ <reference key="NSContentView" ref="570210247"/>
+ <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+ </object>
+ <object class="NSTextField" id="982570975">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 219}, {148, 63}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="901046858">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_GROUP_NAME</string>
+ <reference key="NSSupport" ref="290273273"/>
+ <reference key="NSControlView" ref="982570975"/>
+ <reference key="NSBackgroundColor" ref="592613688"/>
+ <reference key="NSTextColor" ref="748094473"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="188533588">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{199, 219}, {280, 22}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="771835631">
+ <int key="NSCellFlags">-1804468671</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="188533588"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <reference key="NSColor" ref="571857138"/>
+ </object>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textColor</string>
+ <reference key="NSColor" ref="28651200"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMatrix" id="743261621">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{172, 244}, {307, 38}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <int key="NSNumRows">2</int>
+ <int key="NSNumCols">1</int>
+ <object class="NSMutableArray" key="NSCells">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButtonCell" id="182948450">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_USE_NEWTAB</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="743261621"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">128</int>
+ <reference key="NSAlternateImage" ref="1028460734"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <object class="NSButtonCell" id="1001736883">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_USE_URL</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <int key="NSTag">1</int>
+ <reference key="NSControlView" ref="743261621"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">128</int>
+ <object class="NSImage" key="NSNormalImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{18, 18}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="8"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
@@ -1372,7 +1445,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <string key="NSCellSize">{300, 19}</string>
+ <string key="NSCellSize">{307, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
<int key="NSMatrixFlags">1151868928</int>
<string key="NSCellClass">NSActionCell</string>
@@ -1428,193 +1501,80 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
- <int key="NSSelectedRow">1</int>
- <reference key="NSSelectedCell" ref="1001736883"/>
+ <reference key="NSSelectedCell" ref="182948450"/>
<reference key="NSBackgroundColor" ref="592613688"/>
<reference key="NSCellBackgroundColor" ref="571857138"/>
<reference key="NSFont" ref="445696277"/>
</object>
- <object class="NSTextField" id="495791200">
+ <object class="NSTextField" id="881113898">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 44}, {123, 17}}</string>
+ <string key="NSFrame">{{17, 147}, {148, 39}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="617938891">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">^IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME</string>
+ <object class="NSTextFieldCell" key="NSCell" id="519689237">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">^IDS_OPTIONS_TOOLBAR_GROUP_NAME</string>
<reference key="NSSupport" ref="290273273"/>
- <reference key="NSControlView" ref="495791200"/>
+ <reference key="NSControlView" ref="881113898"/>
<reference key="NSBackgroundColor" ref="592613688"/>
<reference key="NSTextColor" ref="748094473"/>
</object>
</object>
- <object class="NSTextField" id="254133467">
+ <object class="NSButton" id="306778908">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 77}, {123, 17}}</string>
+ <string key="NSFrame">{{170, 145}, {311, 18}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="952238196">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">^IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME</string>
- <reference key="NSSupport" ref="290273273"/>
- <reference key="NSControlView" ref="254133467"/>
- <reference key="NSBackgroundColor" ref="592613688"/>
- <reference key="NSTextColor" ref="748094473"/>
+ <object class="NSButtonCell" key="NSCell" id="114177510">
+ <int key="NSCellFlags">-1543373312</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_OPTIONS_PAGE_OPTION_SHOW_BUTTON</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="306778908"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">130</int>
+ <reference key="NSNormalImage" ref="124073107"/>
+ <reference key="NSAlternateImage" ref="927168675"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="192681043">
+ <object class="NSButton" id="136601899">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{139, 34}, {314, 32}}</string>
+ <string key="NSFrame">{{170, 168}, {311, 18}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="523146452">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">^IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT$IDS_PRODUCT_NAME</string>
+ <object class="NSButtonCell" key="NSCell" id="131780438">
+ <int key="NSCellFlags">-1543373312</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_OPTIONS_HOMEPAGE_SHOW_BUTTON</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="192681043"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
+ <reference key="NSControlView" ref="136601899"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">130</int>
+ <reference key="NSNormalImage" ref="124073107"/>
+ <reference key="NSAlternateImage" ref="927168675"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSScrollView" id="54854923">
+ <object class="NSButton" id="19477846">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="570210247">
- <reference key="NSNextResponder" ref="54854923"/>
- <int key="NSvFlags">2304</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTableView" id="165250101">
- <reference key="NSNextResponder" ref="570210247"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{298, 63}</string>
- <reference key="NSSuperview" ref="570210247"/>
- <bool key="NSEnabled">YES</bool>
- <object class="_NSCornerView" key="NSCornerView">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
- </object>
- <object class="NSMutableArray" key="NSTableColumns">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTableColumn" id="1005813658">
- <double key="NSWidth">2.950000e+02</double>
- <double key="NSMinWidth">4.000000e+01</double>
- <double key="NSMaxWidth">1.000000e+03</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.100000e+01</double>
- <int key="NSfFlags">3100</int>
- </object>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">headerTextColor</string>
- <reference key="NSColor" ref="28651200"/>
- </object>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="261581009">
- <int key="NSCellFlags">337772096</int>
- <int key="NSCellFlags2">133120</int>
- <string key="NSContents">Text Cell</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="165250101"/>
- <object class="NSColor" key="NSBackgroundColor" id="452188023">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlBackgroundColor</string>
- <reference key="NSColor" ref="854057974"/>
- </object>
- <reference key="NSTextColor" ref="748094473"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
- <reference key="NSTableView" ref="165250101"/>
- </object>
- </object>
- <double key="NSIntercellSpacingWidth">3.000000e+00</double>
- <double key="NSIntercellSpacingHeight">2.000000e+00</double>
- <reference key="NSBackgroundColor" ref="571857138"/>
- <object class="NSColor" key="NSGridColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">gridColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <double key="NSRowHeight">1.700000e+01</double>
- <int key="NSTvFlags">-901775360</int>
- <int key="NSColumnAutoresizingStyle">4</int>
- <int key="NSDraggingSourceMaskForLocal">15</int>
- <int key="NSDraggingSourceMaskForNonLocal">0</int>
- <bool key="NSAllowsTypeSelect">YES</bool>
- </object>
- </object>
- <string key="NSFrame">{{1, 1}, {298, 63}}</string>
- <reference key="NSSuperview" ref="54854923"/>
- <reference key="NSNextKeyView" ref="165250101"/>
- <reference key="NSDocView" ref="165250101"/>
- <reference key="NSBGColor" ref="452188023"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="895676258">
- <reference key="NSNextResponder" ref="54854923"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{272, 1}, {11, 63}}</string>
- <reference key="NSSuperview" ref="54854923"/>
- <int key="NSsFlags">256</int>
- <reference key="NSTarget" ref="54854923"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">9.868421e-01</double>
- </object>
- <object class="NSScroller" id="757862790">
- <reference key="NSNextResponder" ref="54854923"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {267, 15}}</string>
- <reference key="NSSuperview" ref="54854923"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="54854923"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">5.714286e-01</double>
- </object>
- </object>
- <string key="NSFrame">{{147, 296}, {300, 65}}</string>
- <reference key="NSSuperview" ref="930668015"/>
- <reference key="NSNextKeyView" ref="570210247"/>
- <int key="NSsFlags">530</int>
- <reference key="NSVScroller" ref="895676258"/>
- <reference key="NSHScroller" ref="757862790"/>
- <reference key="NSContentView" ref="570210247"/>
- <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
- </object>
- <object class="NSButton" id="19477846">
- <reference key="NSNextResponder" ref="930668015"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{329, 67}, {124, 32}}</string>
+ <string key="NSFrame">{{390, 85}, {95, 32}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="580118686">
<int key="NSCellFlags">-2080244224</int>
@@ -1631,34 +1591,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSTextField" id="402804707">
+ <object class="NSTextField" id="254133467">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{144, 20}, {306, 14}}</string>
+ <string key="NSFrame">{{17, 93}, {148, 19}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="448510798">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Chromium is [not] the default browser.</string>
- <object class="NSFont" key="NSSupport" id="783256529">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.100000e+01</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="402804707"/>
+ <object class="NSTextFieldCell" key="NSCell" id="952238196">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">^IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME</string>
+ <reference key="NSSupport" ref="290273273"/>
+ <reference key="NSControlView" ref="254133467"/>
<reference key="NSBackgroundColor" ref="592613688"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
+ <reference key="NSTextColor" ref="748094473"/>
</object>
</object>
<object class="NSPopUpButton" id="803459266">
<reference key="NSNextResponder" ref="930668015"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{144, 71}, {186, 26}}</string>
+ <string key="NSFrame">{{169, 89}, {222, 26}}</string>
<reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="197973245">
<int key="NSCellFlags">-2076049856</int>
@@ -1697,9 +1652,72 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSArrowPosition">2</int>
</object>
</object>
+ <object class="NSButton" id="192681043">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{166, 34}, {212, 32}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="523146452">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT$IDS_PRODUCT_NAME</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="192681043"/>
+ <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="402804707">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{169, 20}, {313, 14}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="448510798">
+ <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">Chromium is [not] the default browser.</string>
+ <object class="NSFont" key="NSSupport" id="783256529">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.100000e+01</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="402804707"/>
+ <reference key="NSBackgroundColor" ref="592613688"/>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSTextField" id="495791200">
+ <reference key="NSNextResponder" ref="930668015"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 20}, {148, 42}}</string>
+ <reference key="NSSuperview" ref="930668015"/>
+ <reference key="NSWindow"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="617938891">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">^IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME</string>
+ <reference key="NSSupport" ref="290273273"/>
+ <reference key="NSControlView" ref="495791200"/>
+ <reference key="NSBackgroundColor" ref="592613688"/>
+ <reference key="NSTextColor" ref="748094473"/>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{474, 450}</string>
+ <string key="NSFrameSize">{499, 480}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="393583039">
@@ -1710,12 +1728,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="173446497">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 315}, {138, 17}}</string>
+ <string key="NSFrame">{{17, 238}, {148, 72}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="218087448">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">^IDS_OPTIONS_PASSWORDS_GROUP_NAME</string>
<reference key="NSSupport" ref="290273273"/>
<reference key="NSControlView" ref="173446497"/>
@@ -1726,7 +1744,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMatrix" id="1019357609">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{166, 292}, {300, 40}}</string>
+ <string key="NSFrame">{{176, 272}, {300, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -1854,7 +1872,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <string key="NSCellSize">{300, 19}</string>
+ <string key="NSCellSize">{300, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
<int key="NSMatrixFlags">1151868928</int>
<string key="NSCellClass">NSActionCell</string>
@@ -1918,7 +1936,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="667220499">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{160, 250}, {184, 32}}</string>
+ <string key="NSFrame">{{170, 230}, {184, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="745829249">
@@ -1938,12 +1956,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="921350969">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 21}, {139, 17}}</string>
+ <string key="NSFrame">{{17, 21}, {148, 17}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1066495099">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">^IDS_THEMES_GROUP_NAME</string>
<reference key="NSSupport" ref="290273273"/>
<reference key="NSControlView" ref="921350969"/>
@@ -1954,12 +1972,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="212252045">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 213}, {138, 17}}</string>
+ <string key="NSFrame">{{17, 172}, {148, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="677476881">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">^IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME</string>
<reference key="NSSupport" ref="290273273"/>
<reference key="NSControlView" ref="212252045"/>
@@ -1970,12 +1988,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="155299174">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 142}, {138, 17}}</string>
+ <string key="NSFrame">{{17, 67}, {148, 74}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="340834043">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">^IDS_OPTIONS_BROWSING_DATA_GROUP_NAME</string>
<reference key="NSSupport" ref="290273273"/>
<reference key="NSControlView" ref="155299174"/>
@@ -1986,7 +2004,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="357234760">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{163, 69}, {331, 30}}</string>
+ <string key="NSFrame">{{173, 67}, {309, 14}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1066779324">
@@ -2002,7 +2020,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="885386403">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{160, 131}, {153, 32}}</string>
+ <string key="NSFrame">{{170, 113}, {118, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325720834">
@@ -2022,7 +2040,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="987908490">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{160, 99}, {180, 32}}</string>
+ <string key="NSFrame">{{170, 81}, {153, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="551321318">
@@ -2042,7 +2060,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMatrix" id="854747859">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{166, 190}, {300, 40}}</string>
+ <string key="NSFrame">{{176, 172}, {300, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -2170,7 +2188,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <string key="NSCellSize">{300, 19}</string>
+ <string key="NSCellSize">{300, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
<int key="NSMatrixFlags">1151868928</int>
<string key="NSCellClass">NSActionCell</string>
@@ -2234,7 +2252,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="423027085">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{345, 22}, {82, 16}}</string>
+ <string key="NSFrame">{{290, 22}, {82, 16}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="309945174">
@@ -2254,7 +2272,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="865039969">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{160, 12}, {183, 32}}</string>
+ <string key="NSFrame">{{170, 12}, {118, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="270492768">
@@ -2272,11 +2290,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{511, 352}</string>
+ <string key="NSFrameSize">{499, 330}</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="933437956">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2293,12 +2311,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSCustomView" id="772886817">
<reference key="NSNextResponder" ref="277407604"/>
<int key="NSvFlags">274</int>
- <string key="NSFrameSize">{468, 402}</string>
+ <string key="NSFrameSize">{484, 402}</string>
<reference key="NSSuperview" ref="277407604"/>
<string key="NSClassName">NSView</string>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {468, 402}}</string>
+ <string key="NSFrame">{{1, 1}, {484, 402}}</string>
<reference key="NSSuperview" ref="14278481"/>
<reference key="NSNextKeyView" ref="772886817"/>
<reference key="NSDocView" ref="772886817"/>
@@ -2314,7 +2332,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSScroller" id="331420378">
<reference key="NSNextResponder" ref="14278481"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{469, 1}, {15, 402}}</string>
+ <string key="NSFrame">{{485, 1}, {15, 402}}</string>
<reference key="NSSuperview" ref="14278481"/>
<reference key="NSTarget" ref="14278481"/>
<string key="NSAction">_doScroller:</string>
@@ -2332,7 +2350,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<double key="NSPercent">5.060241e-01</double>
</object>
</object>
- <string key="NSFrame">{{-1, 60}, {485, 404}}</string>
+ <string key="NSFrame">{{-1, 60}, {501, 404}}</string>
<reference key="NSSuperview" ref="933437956"/>
<reference key="NSNextKeyView" ref="277407604"/>
<int key="NSsFlags">18</int>
@@ -2343,7 +2361,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="961419405">
<reference key="NSNextResponder" ref="933437956"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{321, 12}, {148, 32}}</string>
+ <string key="NSFrame">{{337, 12}, {148, 32}}</string>
<reference key="NSSuperview" ref="933437956"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="319834642">
@@ -2361,8 +2379,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{483, 463}</string>
- <reference key="NSSuperview"/>
+ <string key="NSFrameSize">{499, 463}</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomObject" id="385419425">
@@ -2371,6 +2388,36 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSCustomObject" id="305848829">
<string key="NSClassName">ChromeUILocalizer</string>
</object>
+ <object class="NSCustomObject" id="145618054">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="317778625">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="843942020">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="423189874">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="609957344">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="376486454">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="325031373">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="683074852">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="481147379">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
+ <object class="NSCustomObject" id="487772665">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -3100,59 +3147,379 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">521</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>
- <object class="NSArray" key="object" id="415821041">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="145618054"/>
+ <reference key="destination" ref="325467010"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1001"/>
- <reference key="parent" ref="415821041"/>
- <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+ <int key="connectionID">538</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="145618054"/>
+ <reference key="destination" ref="1016627403"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="1003"/>
- <reference key="parent" ref="415821041"/>
- <string key="objectName">First Responder</string>
+ <int key="connectionID">539</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="145618054"/>
+ <reference key="destination" ref="317778625"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1004"/>
- <reference key="parent" ref="415821041"/>
- <string key="objectName">Application</string>
+ <int key="connectionID">546</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="843942020"/>
+ <reference key="destination" ref="982570975"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object" ref="871378074"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="408649839"/>
- <reference ref="530275816"/>
- </object>
- <reference key="parent" ref="415821041"/>
+ <int key="connectionID">547</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="843942020"/>
+ <reference key="destination" ref="743261621"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object" ref="408649839"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="parent" ref="871378074"/>
+ <int key="connectionID">548</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="843942020"/>
+ <reference key="destination" ref="188533588"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">74</int>
- <reference key="object" ref="1016273328"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
+ <int key="connectionID">549</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="423189874"/>
+ <reference key="destination" ref="881113898"/>
+ </object>
+ <int key="connectionID">550</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="423189874"/>
+ <reference key="destination" ref="136601899"/>
+ </object>
+ <int key="connectionID">551</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="423189874"/>
+ <reference key="destination" ref="306778908"/>
+ </object>
+ <int key="connectionID">552</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="609957344"/>
+ <reference key="destination" ref="254133467"/>
+ </object>
+ <int key="connectionID">553</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="609957344"/>
+ <reference key="destination" ref="803459266"/>
+ </object>
+ <int key="connectionID">554</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="609957344"/>
+ <reference key="destination" ref="19477846"/>
+ </object>
+ <int key="connectionID">555</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="376486454"/>
+ <reference key="destination" ref="495791200"/>
+ </object>
+ <int key="connectionID">556</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="376486454"/>
+ <reference key="destination" ref="192681043"/>
+ </object>
+ <int key="connectionID">557</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="376486454"/>
+ <reference key="destination" ref="402804707"/>
+ </object>
+ <int key="connectionID">558</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="325031373"/>
+ <reference key="destination" ref="173446497"/>
+ </object>
+ <int key="connectionID">563</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="325031373"/>
+ <reference key="destination" ref="1019357609"/>
+ </object>
+ <int key="connectionID">564</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="325031373"/>
+ <reference key="destination" ref="667220499"/>
+ </object>
+ <int key="connectionID">565</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="683074852"/>
+ <reference key="destination" ref="212252045"/>
+ </object>
+ <int key="connectionID">566</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="683074852"/>
+ <reference key="destination" ref="854747859"/>
+ </object>
+ <int key="connectionID">567</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="481147379"/>
+ <reference key="destination" ref="155299174"/>
+ </object>
+ <int key="connectionID">568</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="481147379"/>
+ <reference key="destination" ref="885386403"/>
+ </object>
+ <int key="connectionID">569</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="481147379"/>
+ <reference key="destination" ref="987908490"/>
+ </object>
+ <int key="connectionID">570</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object4_</string>
+ <reference key="source" ref="481147379"/>
+ <reference key="destination" ref="357234760"/>
+ </object>
+ <int key="connectionID">571</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="487772665"/>
+ <reference key="destination" ref="921350969"/>
+ </object>
+ <int key="connectionID">572</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="487772665"/>
+ <reference key="destination" ref="865039969"/>
+ </object>
+ <int key="connectionID">573</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="487772665"/>
+ <reference key="destination" ref="423027085"/>
+ </object>
+ <int key="connectionID">574</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="317778625"/>
+ <reference key="destination" ref="165250101"/>
+ </object>
+ <int key="connectionID">579</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="317778625"/>
+ <reference key="destination" ref="909713979"/>
+ </object>
+ <int key="connectionID">580</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="317778625"/>
+ <reference key="destination" ref="940065158"/>
+ </object>
+ <int key="connectionID">581</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object4_</string>
+ <reference key="source" ref="317778625"/>
+ <reference key="destination" ref="810089388"/>
+ </object>
+ <int key="connectionID">582</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">basicsGroupDefaultBrowser_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="376486454"/>
+ </object>
+ <int key="connectionID">583</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">basicsGroupHomePage_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="843942020"/>
+ </object>
+ <int key="connectionID">584</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">basicsGroupSearchEngine_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="609957344"/>
+ </object>
+ <int key="connectionID">585</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">basicsGroupStartup_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="145618054"/>
+ </object>
+ <int key="connectionID">586</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">basicsGroupToolbar_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="423189874"/>
+ </object>
+ <int key="connectionID">587</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">personalStuffGroupAutofill_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="683074852"/>
+ </object>
+ <int key="connectionID">588</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">personalStuffGroupBrowserData_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="481147379"/>
+ </object>
+ <int key="connectionID">589</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">personalStuffGroupPasswords_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="325031373"/>
+ </object>
+ <int key="connectionID">590</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">personalStuffGroupThemes_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="487772665"/>
+ </object>
+ <int key="connectionID">591</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>
+ <object class="NSArray" key="object" id="415821041">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <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="415821041"/>
+ <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="1003"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">First Responder</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-3</int>
+ <reference key="object" ref="1004"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Application</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">3</int>
+ <reference key="object" ref="871378074"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="408649839"/>
+ <reference ref="530275816"/>
+ </object>
+ <reference key="parent" ref="415821041"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="408649839"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="871378074"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">74</int>
+ <reference key="object" ref="1016273328"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1032231978"/>
<reference ref="1043699198"/>
<reference ref="287656702"/>
@@ -3534,671 +3901,731 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="930668015"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="803459266"/>
- <reference ref="402804707"/>
+ <reference ref="325467010"/>
+ <reference ref="1016627403"/>
+ <reference ref="810089388"/>
+ <reference ref="940065158"/>
+ <reference ref="909713979"/>
<reference ref="54854923"/>
+ <reference ref="982570975"/>
<reference ref="188533588"/>
- <reference ref="192681043"/>
- <reference ref="254133467"/>
- <reference ref="495791200"/>
<reference ref="743261621"/>
- <reference ref="982570975"/>
+ <reference ref="881113898"/>
<reference ref="306778908"/>
- <reference ref="1016627403"/>
- <reference ref="325467010"/>
<reference ref="136601899"/>
- <reference ref="881113898"/>
- <reference ref="940065158"/>
- <reference ref="909713979"/>
- <reference ref="810089388"/>
<reference ref="19477846"/>
+ <reference ref="254133467"/>
+ <reference ref="803459266"/>
+ <reference ref="192681043"/>
+ <reference ref="402804707"/>
+ <reference ref="495791200"/>
</object>
<reference key="parent" ref="415821041"/>
<string key="objectName">Basics View</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">92</int>
- <reference key="object" ref="810089388"/>
+ <int key="objectID">482</int>
+ <reference key="object" ref="393583039"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="788559409"/>
+ <reference ref="173446497"/>
+ <reference ref="1019357609"/>
+ <reference ref="667220499"/>
+ <reference ref="921350969"/>
+ <reference ref="212252045"/>
+ <reference ref="155299174"/>
+ <reference ref="357234760"/>
+ <reference ref="885386403"/>
+ <reference ref="987908490"/>
+ <reference ref="854747859"/>
+ <reference ref="865039969"/>
+ <reference ref="423027085"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Personal Stuff View</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">93</int>
- <reference key="object" ref="788559409"/>
- <reference key="parent" ref="810089388"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">88</int>
- <reference key="object" ref="909713979"/>
+ <int key="objectID">27</int>
+ <reference key="object" ref="173446497"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="709698869"/>
+ <reference ref="218087448"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">89</int>
- <reference key="object" ref="709698869"/>
- <reference key="parent" ref="909713979"/>
+ <int key="objectID">28</int>
+ <reference key="object" ref="218087448"/>
+ <reference key="parent" ref="173446497"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">90</int>
- <reference key="object" ref="940065158"/>
+ <int key="objectID">24</int>
+ <reference key="object" ref="1019357609"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="517413682"/>
+ <reference ref="558153776"/>
+ <reference ref="243612558"/>
+ <reference ref="33780881"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">91</int>
- <reference key="object" ref="517413682"/>
- <reference key="parent" ref="940065158"/>
+ <int key="objectID">33</int>
+ <reference key="object" ref="558153776"/>
+ <reference key="parent" ref="1019357609"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">50</int>
- <reference key="object" ref="881113898"/>
+ <int key="objectID">32</int>
+ <reference key="object" ref="243612558"/>
+ <reference key="parent" ref="1019357609"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">31</int>
+ <reference key="object" ref="33780881"/>
+ <reference key="parent" ref="1019357609"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="667220499"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="519689237"/>
+ <reference ref="745829249"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">64</int>
- <reference key="object" ref="519689237"/>
- <reference key="parent" ref="881113898"/>
+ <int key="objectID">35</int>
+ <reference key="object" ref="745829249"/>
+ <reference key="parent" ref="667220499"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">49</int>
- <reference key="object" ref="136601899"/>
+ <int key="objectID">43</int>
+ <reference key="object" ref="921350969"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="131780438"/>
+ <reference ref="1066495099"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">65</int>
- <reference key="object" ref="131780438"/>
- <reference key="parent" ref="136601899"/>
+ <int key="objectID">71</int>
+ <reference key="object" ref="1066495099"/>
+ <reference key="parent" ref="921350969"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">54</int>
- <reference key="object" ref="325467010"/>
+ <int key="objectID">332</int>
+ <reference key="object" ref="212252045"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="542921234"/>
+ <reference ref="677476881"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">55</int>
- <reference key="object" ref="542921234"/>
- <reference key="parent" ref="325467010"/>
+ <int key="objectID">339</int>
+ <reference key="object" ref="677476881"/>
+ <reference key="parent" ref="212252045"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">51</int>
- <reference key="object" ref="1016627403"/>
+ <int key="objectID">344</int>
+ <reference key="object" ref="155299174"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="866030183"/>
- <reference ref="29669784"/>
- <reference ref="144354838"/>
- <reference ref="799465121"/>
+ <reference ref="340834043"/>
</object>
- <reference key="parent" ref="930668015"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">63</int>
- <reference key="object" ref="866030183"/>
- <reference key="parent" ref="1016627403"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">62</int>
- <reference key="object" ref="29669784"/>
- <reference key="parent" ref="1016627403"/>
+ <int key="objectID">345</int>
+ <reference key="object" ref="340834043"/>
+ <reference key="parent" ref="155299174"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">61</int>
- <reference key="object" ref="144354838"/>
- <reference key="parent" ref="1016627403"/>
+ <int key="objectID">346</int>
+ <reference key="object" ref="357234760"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1066779324"/>
+ </object>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">60</int>
- <reference key="object" ref="799465121"/>
- <reference key="parent" ref="1016627403"/>
+ <int key="objectID">349</int>
+ <reference key="object" ref="1066779324"/>
+ <reference key="parent" ref="357234760"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">48</int>
- <reference key="object" ref="306778908"/>
+ <int key="objectID">347</int>
+ <reference key="object" ref="885386403"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="114177510"/>
+ <reference ref="325720834"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">66</int>
- <reference key="object" ref="114177510"/>
- <reference key="parent" ref="306778908"/>
+ <int key="objectID">348</int>
+ <reference key="object" ref="325720834"/>
+ <reference key="parent" ref="885386403"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">53</int>
- <reference key="object" ref="982570975"/>
+ <int key="objectID">353</int>
+ <reference key="object" ref="987908490"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="901046858"/>
+ <reference ref="551321318"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">56</int>
- <reference key="object" ref="901046858"/>
- <reference key="parent" ref="982570975"/>
+ <int key="objectID">354</int>
+ <reference key="object" ref="551321318"/>
+ <reference key="parent" ref="987908490"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">52</int>
- <reference key="object" ref="743261621"/>
+ <int key="objectID">362</int>
+ <reference key="object" ref="854747859"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="820915187"/>
- <reference ref="1001736883"/>
- <reference ref="182948450"/>
+ <reference ref="674682819"/>
+ <reference ref="201008548"/>
+ <reference ref="726075166"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">59</int>
- <reference key="object" ref="820915187"/>
- <reference key="parent" ref="743261621"/>
+ <int key="objectID">365</int>
+ <reference key="object" ref="674682819"/>
+ <reference key="parent" ref="854747859"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="1001736883"/>
- <reference key="parent" ref="743261621"/>
+ <int key="objectID">364</int>
+ <reference key="object" ref="201008548"/>
+ <reference key="parent" ref="854747859"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="182948450"/>
- <reference key="parent" ref="743261621"/>
+ <int key="objectID">363</int>
+ <reference key="object" ref="726075166"/>
+ <reference key="parent" ref="854747859"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">45</int>
- <reference key="object" ref="495791200"/>
+ <int key="objectID">457</int>
+ <reference key="object" ref="423027085"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="617938891"/>
+ <reference ref="309945174"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">69</int>
- <reference key="object" ref="617938891"/>
- <reference key="parent" ref="495791200"/>
+ <int key="objectID">458</int>
+ <reference key="object" ref="309945174"/>
+ <reference key="parent" ref="423027085"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">47</int>
- <reference key="object" ref="254133467"/>
+ <int key="objectID">472</int>
+ <reference key="object" ref="865039969"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="952238196"/>
+ <reference ref="270492768"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="393583039"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">67</int>
- <reference key="object" ref="952238196"/>
- <reference key="parent" ref="254133467"/>
+ <int key="objectID">473</int>
+ <reference key="object" ref="270492768"/>
+ <reference key="parent" ref="865039969"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">44</int>
- <reference key="object" ref="192681043"/>
+ <int key="objectID">483</int>
+ <reference key="object" ref="933437956"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="523146452"/>
+ <reference ref="14278481"/>
+ <reference ref="961419405"/>
</object>
- <reference key="parent" ref="930668015"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">70</int>
- <reference key="object" ref="523146452"/>
- <reference key="parent" ref="192681043"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Under the Hood View</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">77</int>
- <reference key="object" ref="188533588"/>
+ <int key="objectID">156</int>
+ <reference key="object" ref="14278481"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="771835631"/>
+ <reference ref="772886817"/>
+ <reference ref="470087648"/>
+ <reference ref="331420378"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="933437956"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">78</int>
- <reference key="object" ref="771835631"/>
- <reference key="parent" ref="188533588"/>
+ <int key="objectID">159</int>
+ <reference key="object" ref="772886817"/>
+ <reference key="parent" ref="14278481"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">79</int>
- <reference key="object" ref="54854923"/>
+ <int key="objectID">158</int>
+ <reference key="object" ref="470087648"/>
+ <reference key="parent" ref="14278481"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">157</int>
+ <reference key="object" ref="331420378"/>
+ <reference key="parent" ref="14278481"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">160</int>
+ <reference key="object" ref="961419405"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="165250101"/>
- <reference ref="757862790"/>
- <reference ref="895676258"/>
+ <reference ref="319834642"/>
</object>
- <reference key="parent" ref="930668015"/>
+ <reference key="parent" ref="933437956"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">82</int>
- <reference key="object" ref="165250101"/>
+ <int key="objectID">161</int>
+ <reference key="object" ref="319834642"/>
+ <reference key="parent" ref="961419405"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">485</int>
+ <reference key="object" ref="530275816"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1005813658"/>
+ <reference ref="9223926"/>
+ <reference ref="198074817"/>
+ <reference ref="268912411"/>
</object>
- <reference key="parent" ref="54854923"/>
+ <reference key="parent" ref="871378074"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">81</int>
- <reference key="object" ref="757862790"/>
- <reference key="parent" ref="54854923"/>
+ <int key="objectID">493</int>
+ <reference key="object" ref="9223926"/>
+ <reference key="parent" ref="530275816"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">80</int>
- <reference key="object" ref="895676258"/>
- <reference key="parent" ref="54854923"/>
+ <int key="objectID">494</int>
+ <reference key="object" ref="198074817"/>
+ <reference key="parent" ref="530275816"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">84</int>
- <reference key="object" ref="1005813658"/>
+ <int key="objectID">495</int>
+ <reference key="object" ref="268912411"/>
+ <reference key="parent" ref="530275816"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">505</int>
+ <reference key="object" ref="385419425"/>
+ <reference key="parent" ref="415821041"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">510</int>
+ <reference key="object" ref="305848829"/>
+ <reference key="parent" ref="415821041"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">515</int>
+ <reference key="object" ref="732733616"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="261581009"/>
+ <reference ref="21803731"/>
</object>
- <reference key="parent" ref="165250101"/>
+ <reference key="parent" ref="1016273328"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">87</int>
- <reference key="object" ref="261581009"/>
- <reference key="parent" ref="1005813658"/>
+ <int key="objectID">516</int>
+ <reference key="object" ref="21803731"/>
+ <reference key="parent" ref="732733616"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">94</int>
- <reference key="object" ref="19477846"/>
+ <int key="objectID">54</int>
+ <reference key="object" ref="325467010"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="580118686"/>
+ <reference ref="542921234"/>
</object>
<reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">95</int>
- <reference key="object" ref="580118686"/>
- <reference key="parent" ref="19477846"/>
+ <int key="objectID">55</int>
+ <reference key="object" ref="542921234"/>
+ <reference key="parent" ref="325467010"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">304</int>
- <reference key="object" ref="402804707"/>
+ <int key="objectID">51</int>
+ <reference key="object" ref="1016627403"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="448510798"/>
+ <reference ref="866030183"/>
+ <reference ref="29669784"/>
+ <reference ref="144354838"/>
+ <reference ref="799465121"/>
</object>
<reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">305</int>
- <reference key="object" ref="448510798"/>
- <reference key="parent" ref="402804707"/>
+ <int key="objectID">63</int>
+ <reference key="object" ref="866030183"/>
+ <reference key="parent" ref="1016627403"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">412</int>
- <reference key="object" ref="803459266"/>
+ <int key="objectID">62</int>
+ <reference key="object" ref="29669784"/>
+ <reference key="parent" ref="1016627403"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">61</int>
+ <reference key="object" ref="144354838"/>
+ <reference key="parent" ref="1016627403"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">60</int>
+ <reference key="object" ref="799465121"/>
+ <reference key="parent" ref="1016627403"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">92</int>
+ <reference key="object" ref="810089388"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="197973245"/>
+ <reference ref="788559409"/>
</object>
<reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">413</int>
- <reference key="object" ref="197973245"/>
+ <int key="objectID">93</int>
+ <reference key="object" ref="788559409"/>
+ <reference key="parent" ref="810089388"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">90</int>
+ <reference key="object" ref="940065158"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="493878690"/>
+ <reference ref="517413682"/>
</object>
- <reference key="parent" ref="803459266"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">414</int>
- <reference key="object" ref="493878690"/>
+ <int key="objectID">91</int>
+ <reference key="object" ref="517413682"/>
+ <reference key="parent" ref="940065158"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">88</int>
+ <reference key="object" ref="909713979"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="787711269"/>
+ <reference ref="709698869"/>
</object>
- <reference key="parent" ref="197973245"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">415</int>
- <reference key="object" ref="787711269"/>
- <reference key="parent" ref="493878690"/>
+ <int key="objectID">89</int>
+ <reference key="object" ref="709698869"/>
+ <reference key="parent" ref="909713979"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">482</int>
- <reference key="object" ref="393583039"/>
+ <int key="objectID">79</int>
+ <reference key="object" ref="54854923"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="865039969"/>
- <reference ref="423027085"/>
- <reference ref="854747859"/>
- <reference ref="987908490"/>
- <reference ref="885386403"/>
- <reference ref="357234760"/>
- <reference ref="155299174"/>
- <reference ref="212252045"/>
- <reference ref="921350969"/>
- <reference ref="667220499"/>
- <reference ref="1019357609"/>
- <reference ref="173446497"/>
+ <reference ref="165250101"/>
+ <reference ref="757862790"/>
+ <reference ref="895676258"/>
</object>
- <reference key="parent" ref="415821041"/>
- <string key="objectName">Personal Stuff View</string>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="173446497"/>
+ <int key="objectID">82</int>
+ <reference key="object" ref="165250101"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="218087448"/>
+ <reference ref="1005813658"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="54854923"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">28</int>
- <reference key="object" ref="218087448"/>
- <reference key="parent" ref="173446497"/>
+ <int key="objectID">81</int>
+ <reference key="object" ref="757862790"/>
+ <reference key="parent" ref="54854923"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="1019357609"/>
+ <int key="objectID">80</int>
+ <reference key="object" ref="895676258"/>
+ <reference key="parent" ref="54854923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">84</int>
+ <reference key="object" ref="1005813658"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="558153776"/>
- <reference ref="243612558"/>
- <reference ref="33780881"/>
+ <reference ref="261581009"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="165250101"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">33</int>
- <reference key="object" ref="558153776"/>
- <reference key="parent" ref="1019357609"/>
+ <int key="objectID">87</int>
+ <reference key="object" ref="261581009"/>
+ <reference key="parent" ref="1005813658"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">32</int>
- <reference key="object" ref="243612558"/>
- <reference key="parent" ref="1019357609"/>
+ <int key="objectID">53</int>
+ <reference key="object" ref="982570975"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="901046858"/>
+ </object>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">31</int>
- <reference key="object" ref="33780881"/>
- <reference key="parent" ref="1019357609"/>
+ <int key="objectID">56</int>
+ <reference key="object" ref="901046858"/>
+ <reference key="parent" ref="982570975"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="667220499"/>
+ <int key="objectID">77</int>
+ <reference key="object" ref="188533588"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="745829249"/>
+ <reference ref="771835631"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="745829249"/>
- <reference key="parent" ref="667220499"/>
+ <int key="objectID">78</int>
+ <reference key="object" ref="771835631"/>
+ <reference key="parent" ref="188533588"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="921350969"/>
+ <int key="objectID">52</int>
+ <reference key="object" ref="743261621"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1066495099"/>
+ <reference ref="820915187"/>
+ <reference ref="1001736883"/>
+ <reference ref="182948450"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">71</int>
- <reference key="object" ref="1066495099"/>
- <reference key="parent" ref="921350969"/>
+ <int key="objectID">59</int>
+ <reference key="object" ref="820915187"/>
+ <reference key="parent" ref="743261621"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="1001736883"/>
+ <reference key="parent" ref="743261621"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">57</int>
+ <reference key="object" ref="182948450"/>
+ <reference key="parent" ref="743261621"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">332</int>
- <reference key="object" ref="212252045"/>
+ <int key="objectID">50</int>
+ <reference key="object" ref="881113898"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="677476881"/>
+ <reference ref="519689237"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">339</int>
- <reference key="object" ref="677476881"/>
- <reference key="parent" ref="212252045"/>
+ <int key="objectID">64</int>
+ <reference key="object" ref="519689237"/>
+ <reference key="parent" ref="881113898"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">344</int>
- <reference key="object" ref="155299174"/>
+ <int key="objectID">48</int>
+ <reference key="object" ref="306778908"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="340834043"/>
+ <reference ref="114177510"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">345</int>
- <reference key="object" ref="340834043"/>
- <reference key="parent" ref="155299174"/>
+ <int key="objectID">66</int>
+ <reference key="object" ref="114177510"/>
+ <reference key="parent" ref="306778908"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">346</int>
- <reference key="object" ref="357234760"/>
+ <int key="objectID">49</int>
+ <reference key="object" ref="136601899"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1066779324"/>
+ <reference ref="131780438"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">349</int>
- <reference key="object" ref="1066779324"/>
- <reference key="parent" ref="357234760"/>
+ <int key="objectID">65</int>
+ <reference key="object" ref="131780438"/>
+ <reference key="parent" ref="136601899"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">347</int>
- <reference key="object" ref="885386403"/>
+ <int key="objectID">94</int>
+ <reference key="object" ref="19477846"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="325720834"/>
+ <reference ref="580118686"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">348</int>
- <reference key="object" ref="325720834"/>
- <reference key="parent" ref="885386403"/>
+ <int key="objectID">95</int>
+ <reference key="object" ref="580118686"/>
+ <reference key="parent" ref="19477846"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">353</int>
- <reference key="object" ref="987908490"/>
+ <int key="objectID">47</int>
+ <reference key="object" ref="254133467"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="551321318"/>
+ <reference ref="952238196"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">354</int>
- <reference key="object" ref="551321318"/>
- <reference key="parent" ref="987908490"/>
+ <int key="objectID">67</int>
+ <reference key="object" ref="952238196"/>
+ <reference key="parent" ref="254133467"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">362</int>
- <reference key="object" ref="854747859"/>
+ <int key="objectID">412</int>
+ <reference key="object" ref="803459266"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="674682819"/>
- <reference ref="201008548"/>
- <reference ref="726075166"/>
+ <reference ref="197973245"/>
</object>
- <reference key="parent" ref="393583039"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">365</int>
- <reference key="object" ref="674682819"/>
- <reference key="parent" ref="854747859"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">364</int>
- <reference key="object" ref="201008548"/>
- <reference key="parent" ref="854747859"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">363</int>
- <reference key="object" ref="726075166"/>
- <reference key="parent" ref="854747859"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">457</int>
- <reference key="object" ref="423027085"/>
+ <int key="objectID">413</int>
+ <reference key="object" ref="197973245"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="309945174"/>
+ <reference ref="493878690"/>
</object>
- <reference key="parent" ref="393583039"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">458</int>
- <reference key="object" ref="309945174"/>
- <reference key="parent" ref="423027085"/>
+ <reference key="parent" ref="803459266"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">472</int>
- <reference key="object" ref="865039969"/>
+ <int key="objectID">414</int>
+ <reference key="object" ref="493878690"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="270492768"/>
+ <reference ref="787711269"/>
</object>
- <reference key="parent" ref="393583039"/>
+ <reference key="parent" ref="197973245"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">473</int>
- <reference key="object" ref="270492768"/>
- <reference key="parent" ref="865039969"/>
+ <int key="objectID">415</int>
+ <reference key="object" ref="787711269"/>
+ <reference key="parent" ref="493878690"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">483</int>
- <reference key="object" ref="933437956"/>
+ <int key="objectID">44</int>
+ <reference key="object" ref="192681043"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="14278481"/>
- <reference ref="961419405"/>
+ <reference ref="523146452"/>
</object>
- <reference key="parent" ref="415821041"/>
- <string key="objectName">Under the Hood View</string>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">156</int>
- <reference key="object" ref="14278481"/>
+ <int key="objectID">70</int>
+ <reference key="object" ref="523146452"/>
+ <reference key="parent" ref="192681043"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">304</int>
+ <reference key="object" ref="402804707"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="772886817"/>
- <reference ref="470087648"/>
- <reference ref="331420378"/>
+ <reference ref="448510798"/>
</object>
- <reference key="parent" ref="933437956"/>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">159</int>
- <reference key="object" ref="772886817"/>
- <reference key="parent" ref="14278481"/>
+ <int key="objectID">305</int>
+ <reference key="object" ref="448510798"/>
+ <reference key="parent" ref="402804707"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">158</int>
- <reference key="object" ref="470087648"/>
- <reference key="parent" ref="14278481"/>
+ <int key="objectID">45</int>
+ <reference key="object" ref="495791200"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="617938891"/>
+ </object>
+ <reference key="parent" ref="930668015"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">157</int>
- <reference key="object" ref="331420378"/>
- <reference key="parent" ref="14278481"/>
+ <int key="objectID">69</int>
+ <reference key="object" ref="617938891"/>
+ <reference key="parent" ref="495791200"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">160</int>
- <reference key="object" ref="961419405"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="319834642"/>
- </object>
- <reference key="parent" ref="933437956"/>
+ <int key="objectID">528</int>
+ <reference key="object" ref="145618054"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Basics Startup Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">161</int>
- <reference key="object" ref="319834642"/>
- <reference key="parent" ref="961419405"/>
+ <int key="objectID">529</int>
+ <reference key="object" ref="843942020"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Basics Home Page Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">485</int>
- <reference key="object" ref="530275816"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="9223926"/>
- <reference ref="198074817"/>
- <reference ref="268912411"/>
- </object>
- <reference key="parent" ref="871378074"/>
+ <int key="objectID">530</int>
+ <reference key="object" ref="423189874"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Basics Toolbar Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">493</int>
- <reference key="object" ref="9223926"/>
- <reference key="parent" ref="530275816"/>
+ <int key="objectID">531</int>
+ <reference key="object" ref="609957344"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Basics Search Engine Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">494</int>
- <reference key="object" ref="198074817"/>
- <reference key="parent" ref="530275816"/>
+ <int key="objectID">532</int>
+ <reference key="object" ref="376486454"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Basics Default Browser Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">495</int>
- <reference key="object" ref="268912411"/>
- <reference key="parent" ref="530275816"/>
+ <int key="objectID">541</int>
+ <reference key="object" ref="317778625"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Basics Startup Group Cont</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">505</int>
- <reference key="object" ref="385419425"/>
+ <int key="objectID">559</int>
+ <reference key="object" ref="325031373"/>
<reference key="parent" ref="415821041"/>
+ <string key="objectName">Personal Stuff Passwords Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">510</int>
- <reference key="object" ref="305848829"/>
+ <int key="objectID">560</int>
+ <reference key="object" ref="683074852"/>
<reference key="parent" ref="415821041"/>
+ <string key="objectName">Personal Stuff Autofill Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">515</int>
- <reference key="object" ref="732733616"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="21803731"/>
- </object>
- <reference key="parent" ref="1016273328"/>
+ <int key="objectID">561</int>
+ <reference key="object" ref="481147379"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Personal Stuff Browser Data Group</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">516</int>
- <reference key="object" ref="21803731"/>
- <reference key="parent" ref="732733616"/>
+ <int key="objectID">562</int>
+ <reference key="object" ref="487772665"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Personal Stuff Themes Group</string>
</object>
</object>
</object>
@@ -4310,6 +4737,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>48.IBPluginDependency</string>
<string>481.IBEditorWindowLastContentRect</string>
<string>481.IBPluginDependency</string>
+ <string>481.IBUserGuides</string>
<string>482.IBEditorWindowLastContentRect</string>
<string>482.IBPluginDependency</string>
<string>483.IBEditorWindowLastContentRect</string>
@@ -4331,10 +4759,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>516.CustomClassName</string>
<string>516.IBPluginDependency</string>
<string>52.IBPluginDependency</string>
+ <string>528.IBPluginDependency</string>
+ <string>529.IBPluginDependency</string>
<string>53.IBPluginDependency</string>
+ <string>530.IBPluginDependency</string>
+ <string>531.IBPluginDependency</string>
+ <string>532.IBPluginDependency</string>
<string>54.IBPluginDependency</string>
+ <string>541.IBPluginDependency</string>
<string>55.IBPluginDependency</string>
+ <string>559.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
+ <string>560.IBPluginDependency</string>
+ <string>561.IBPluginDependency</string>
+ <string>562.IBPluginDependency</string>
<string>57.IBPluginDependency</string>
<string>58.IBPluginDependency</string>
<string>59.IBPluginDependency</string>
@@ -4472,11 +4910,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{80, 1032}, {474, 450}}</string>
+ <string>{{85, 1019}, {499, 480}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{61, 804}, {511, 352}}</string>
+ <object class="NSMutableArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <string>{{86, 655}, {499, 330}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{81, 523}, {483, 463}}</string>
+ <string>{{81, 523}, {499, 463}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{682, 562}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4513,6 +4954,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{530, 160}, {466, 659}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4553,7 +5004,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">522</int>
+ <int key="maxID">591</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4566,6 +5017,33 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="minorKey">browser/cocoa/ui_localizer.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">GTMIBArray</string>
+ <string key="superclassName">NSArray</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>object1_</string>
+ <string>object2_</string>
+ <string>object3_</string>
+ <string>object4_</string>
+ <string>object5_</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../third_party/GTM/AppKit/GTMIBArray.h</string>
+ </object>
+ </object>
<object class="IBPartialClassDescription">
<string key="className">GTMUILocalizer</string>
<string key="superclassName">NSObject</string>
@@ -4597,6 +5075,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="minorKey">browser/cocoa/hyperlink_button_cell.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSMenuItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/nsmenuitem_additions.h</string>
+ </object>
+ </object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4664,9 +5149,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>advancedScroller_</string>
<string>advancedView_</string>
+ <string>basicsGroupDefaultBrowser_</string>
+ <string>basicsGroupHomePage_</string>
+ <string>basicsGroupSearchEngine_</string>
+ <string>basicsGroupStartup_</string>
+ <string>basicsGroupToolbar_</string>
<string>basicsView_</string>
<string>customPagesArrayController_</string>
<string>downloadLocationControl_</string>
+ <string>personalStuffGroupAutofill_</string>
+ <string>personalStuffGroupBrowserData_</string>
+ <string>personalStuffGroupPasswords_</string>
+ <string>personalStuffGroupThemes_</string>
<string>personalStuffView_</string>
<string>toolbar_</string>
<string>underTheHoodView_</string>
@@ -4675,9 +5169,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSScrollView</string>
<string>NSView</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
<string>NSView</string>
<string>NSArrayController</string>
<string>NSPathControl</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
+ <string>NSArray</string>
<string>NSView</string>
<string>NSToolbar</string>
<string>NSView</string>
diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h
index f1e3fd6f6404c625f6c8f3fbbfb70120f43dbd1b..07a4b7dd7497259bdcc4727a933bc76ff20d4cc2 100644
--- a/chrome/browser/cocoa/preferences_window_controller.h
+++ b/chrome/browser/cocoa/preferences_window_controller.h
@@ -41,6 +41,19 @@ class Profile;
// The last page the user was on when they opened the Options window.
IntegerPrefMember lastSelectedPage_;
+ // The groups of the Basics view for layout fixup.
+ IBOutlet NSArray* basicsGroupStartup_;
+ IBOutlet NSArray* basicsGroupHomePage_;
+ IBOutlet NSArray* basicsGroupToolbar_;
+ IBOutlet NSArray* basicsGroupSearchEngine_;
+ IBOutlet NSArray* basicsGroupDefaultBrowser_;
+
+ // The groups of the Personal Stuff view for layout fixup.
+ IBOutlet NSArray* personalStuffGroupPasswords_;
+ IBOutlet NSArray* personalStuffGroupAutofill_;
+ IBOutlet NSArray* personalStuffGroupBrowserData_;
+ IBOutlet NSArray* personalStuffGroupThemes_;
+
// Having two animations around is bad (they fight), so just use one.
scoped_nsobject<NSViewAnimation> animation_;
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index e3243f475e715a9e116042218e59cacb43791441..adc1970b7426886dccb7902ebde29d0d9ae640b3 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -38,6 +38,7 @@
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "net/base/cookie_policy.h"
+#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
NSString* const kUserDoneEditingPrefsNotification =
@"kUserDoneEditingPrefsNotification";
@@ -64,6 +65,161 @@ void RemoveAllButLastView(NSArray* views) {
}
}
+// Helper for tweaking the prefs window, if view is a:
+// checkbox, radio group or label: it gets a forced wrap at current size
+// editable field: left as is
+// anything else: do +[GTMUILocalizerAndLayoutTweaker sizeToFitView:]
+NSSize WrapOrSizeToFit(NSView* view) {
+ if ([view isKindOfClass:[NSTextField class]]) {
+ NSTextField* textField = static_cast<NSTextField*>(view);
+ if ([textField isEditable])
+ return NSZeroSize;
+ CGFloat heightChange =
+ [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:textField];
+ return NSMakeSize(0.0, heightChange);
+ }
+ if ([view isKindOfClass:[NSMatrix class]]) {
+ NSMatrix* radioGroup = static_cast<NSMatrix*>(view);
+ [GTMUILocalizerAndLayoutTweaker wrapRadioGroupForWidth:radioGroup];
+ return [GTMUILocalizerAndLayoutTweaker sizeToFitView:view];
+ }
+ if ([view isKindOfClass:[NSButton class]]) {
+ NSButton* button = static_cast<NSButton*>(view);
+ NSButtonCell* buttonCell = [button cell];
+ // Decide it's a checkbox via showsStateBy and highlightsBy.
+ if (([buttonCell showsStateBy] == NSCellState) &&
+ ([buttonCell highlightsBy] == NSCellState)) {
+ [GTMUILocalizerAndLayoutTweaker wrapButtonTitleForWidth:button];
+ return [GTMUILocalizerAndLayoutTweaker sizeToFitView:view];
+ }
+ }
+ return [GTMUILocalizerAndLayoutTweaker sizeToFitView:view];
+}
+
+// The different behaviors for the "pref group" auto sizing.
+enum AutoSizeGroupBehavior {
+ kAutoSizeGroupBehaviorVerticalToFit,
+ kAutoSizeGroupBehaviorVerticalFirstToFit,
+ kAutoSizeGroupBehaviorHorizontalToFit,
+ kAutoSizeGroupBehaviorHorizontalFirstGrows
+};
+
+// Helper to tweak the layout of the "pref groups" and also ripple any height
+// changes from one group to the next groups' origins.
+// |views| is an ordered list of views with first being the label for the
+// group and the rest being top down or left to right ordering of the views.
+// The label is assumed to already be the same height as all the views it is
+// next too.
+CGFloat AutoSizeGroup(NSArray* views, AutoSizeGroupBehavior behavior,
+ CGFloat verticalShift) {
+ DCHECK_GE([views count], 2U) << "Should be at least a label and a control";
+ NSTextField* label = [views objectAtIndex:0];
+ DCHECK([label isKindOfClass:[NSTextField class]])
+ << "First view should be the label for the group";
+
+ // Auto size the label to see if we need more vertical space for its localized
+ // string.
+ CGFloat labelHeightChange =
+ [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:label];
+
+ CGFloat localVerticalShift = 0.0;
+ switch (behavior) {
+ case kAutoSizeGroupBehaviorVerticalToFit: {
+ // Walk bottom up doing the sizing and moves.
+ for (NSUInteger idx = [views count] - 1; idx > 0; --idx) {
+ NSView* view = [views objectAtIndex:idx];
+ NSSize delta = WrapOrSizeToFit(view);
+ DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
+ if (localVerticalShift) {
+ NSPoint origin = [view frame].origin;
+ origin.y += localVerticalShift;
+ [view setFrameOrigin:origin];
+ }
+ localVerticalShift += delta.height;
+ }
+ break;
+ }
+ case kAutoSizeGroupBehaviorVerticalFirstToFit: {
+ // Just size the top one.
+ NSView* view = [views objectAtIndex:1];
+ NSSize delta = WrapOrSizeToFit(view);
+ DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
+ localVerticalShift += delta.height;
+ break;
+ }
+ case kAutoSizeGroupBehaviorHorizontalToFit: {
+ // Walk left to right doing the sizing and moves.
+ // NOTE: Don't worry about vertical, assume it always fits.
+ CGFloat horizontalShift = 0.0;
+ for (NSUInteger idx = 1; idx < [views count]; ++idx) {
+ NSView* view = [views objectAtIndex:idx];
+ NSSize delta = WrapOrSizeToFit(view);
+ DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
+ if (horizontalShift) {
+ NSPoint origin = [view frame].origin;
+ origin.x += horizontalShift;
+ [view setFrameOrigin:origin];
+ }
+ horizontalShift += delta.width;
+ }
+ break;
+ }
+ case kAutoSizeGroupBehaviorHorizontalFirstGrows: {
+ // Walk right to left doing the sizing and moves, then apply the space
+ // collected into the first.
+ // NOTE: Don't worry about vertical, assume it always all fits.
+ CGFloat horizontalShift = 0.0;
+ for (NSUInteger idx = [views count] - 1; idx > 1; --idx) {
+ NSView* view = [views objectAtIndex:idx];
+ NSSize delta = WrapOrSizeToFit(view);
+ DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
+ horizontalShift -= delta.width;
+ NSPoint origin = [view frame].origin;
+ origin.x += horizontalShift;
+ [view setFrameOrigin:origin];
+ }
+ if (horizontalShift) {
+ NSView* view = [views objectAtIndex:1];
+ NSSize delta = NSMakeSize(horizontalShift, 0.0);
+ [GTMUILocalizerAndLayoutTweaker
+ resizeViewWithoutAutoResizingSubViews:view
+ delta:delta];
+ }
+ break;
+ }
+ default:
+ NOTREACHED();
+ break;
+ }
+
+ // If the label grew more then the views, the other views get an extra shift.
+ // Otherwise, move the label to its top is aligned with the other views.
+ CGFloat nonLabelShift = 0.0;
+ if (labelHeightChange > localVerticalShift) {
+ // Since the lable is taller, centering the other views looks best, just
+ // shift the views by 1/2 of the size difference.
+ nonLabelShift = (labelHeightChange - localVerticalShift) / 2.0;
+ } else {
+ NSPoint origin = [label frame].origin;
+ origin.y += localVerticalShift - labelHeightChange;
+ [label setFrameOrigin:origin];
+ }
+
+ // Apply the input shift requested along with any the shift from label being
+ // taller then the rest of the group.
+ for (NSView* view in views) {
+ NSPoint origin = [view frame].origin;
+ origin.y += verticalShift;
+ if (view != label) {
+ origin.y += nonLabelShift;
+ }
+ [view setFrameOrigin:origin];
+ }
+
+ // Return how much the group grew.
+ return localVerticalShift + nonLabelShift;
+}
+
} // namespace
//-------------------------------------------------------------------------
@@ -179,9 +335,49 @@ class PrefObserverBridge : public NotificationObserver {
}
- (void)awakeFromNib {
- NSRect underTheHoodFrame = [underTheHoodView_ frame];
+
+ // Do runtime fixup of the "basics" and "personal stuff" pages for the
+ // strings. Work bottom up shifting views up as needed, and then resize the
+ // page.
+ CGFloat verticalShift = 0.0;
+ verticalShift += AutoSizeGroup(basicsGroupDefaultBrowser_,
+ kAutoSizeGroupBehaviorVerticalFirstToFit,
+ verticalShift);
+ verticalShift += AutoSizeGroup(basicsGroupSearchEngine_,
+ kAutoSizeGroupBehaviorHorizontalFirstGrows,
+ verticalShift);
+ verticalShift += AutoSizeGroup(basicsGroupToolbar_,
+ kAutoSizeGroupBehaviorVerticalToFit,
+ verticalShift);
+ verticalShift += AutoSizeGroup(basicsGroupHomePage_,
+ kAutoSizeGroupBehaviorVerticalToFit,
+ verticalShift);
+ verticalShift += AutoSizeGroup(basicsGroupStartup_,
+ kAutoSizeGroupBehaviorVerticalFirstToFit,
+ verticalShift);
+ [GTMUILocalizerAndLayoutTweaker
+ resizeViewWithoutAutoResizingSubViews:basicsView_
+ delta:NSMakeSize(0.0, verticalShift)];
+
+ verticalShift = 0.0;
+ verticalShift += AutoSizeGroup(personalStuffGroupThemes_,
+ kAutoSizeGroupBehaviorHorizontalToFit,
+ verticalShift);
+ verticalShift += AutoSizeGroup(personalStuffGroupBrowserData_,
+ kAutoSizeGroupBehaviorVerticalToFit,
+ verticalShift);
+ verticalShift += AutoSizeGroup(personalStuffGroupAutofill_,
+ kAutoSizeGroupBehaviorVerticalToFit,
+ verticalShift);
+ verticalShift += AutoSizeGroup(personalStuffGroupPasswords_,
+ kAutoSizeGroupBehaviorVerticalFirstToFit,
+ verticalShift);
+ [GTMUILocalizerAndLayoutTweaker
+ resizeViewWithoutAutoResizingSubViews:personalStuffView_
+ delta:NSMakeSize(0.0, verticalShift)];
// Make sure the window is wide enough to fit the the widest view
+ NSRect underTheHoodFrame = [underTheHoodView_ frame];
CGFloat widest = std::max(NSWidth([basicsView_ frame]),
NSWidth([personalStuffView_ frame]));
widest = std::max(widest, NSWidth(underTheHoodFrame));
@@ -199,15 +395,15 @@ class PrefObserverBridge : public NotificationObserver {
advancedContentSize.width = [advancedScroller_ contentSize].width;
[advancedView_ setFrameSize:advancedContentSize];
- // Put the advanced view into the scroller and scroll it to the top.
- [advancedScroller_ setDocumentView:advancedView_];
- [advancedView_ scrollPoint:NSMakePoint(0, advancedContentSize.height)];
-
// Adjust the view origins so they show up centered.
CenterViewForWidth(basicsView_, widest);
CenterViewForWidth(personalStuffView_, widest);
CenterViewForWidth(underTheHoodView_, widest);
+ // Put the advanced view into the scroller and scroll it to the top.
+ [advancedScroller_ setDocumentView:advancedView_];
+ [advancedView_ scrollPoint:NSMakePoint(0, advancedContentSize.height)];
+
// Get the last visited page from local state.
OptionsPage page = static_cast<OptionsPage>(lastSelectedPage_.GetValue());
if (page == OPTIONS_PAGE_DEFAULT)
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 130455d907590dbf6973533aa773b8e2fa96885c..9114d88b5c92f3d678bd8acdf4dee885f9bbf4c6 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2564,6 +2564,8 @@
# Build the necessary GTM sources
'../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h',
'../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.m',
+ '../third_party/GTM/AppKit/GTMIBArray.h',
+ '../third_party/GTM/AppKit/GTMIBArray.m',
'../third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.m',
'../third_party/GTM/AppKit/GTMNSColor+Luminance.m',
'../third_party/GTM/AppKit/GTMTheme.m',