summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/nibs/Preferences.xib376
-rw-r--r--chrome/browser/cocoa/autoseparating_menu.h13
-rw-r--r--chrome/browser/cocoa/autoseparating_menu.m26
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.h5
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm77
-rw-r--r--chrome/chrome.gyp2
6 files changed, 131 insertions, 368 deletions
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index 7bf9390..e0e098c 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10A432</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
- </object>
+ <string key="IBDocument.SystemVersion">9L30</string>
+ <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.AppKitVersion">949.54</string>
+ <string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="39"/>
+ <integer value="18"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -20,7 +16,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -46,7 +42,7 @@
<string key="NSWindowTitle">Preferences</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="408649839">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -62,7 +58,7 @@
<object class="NSTabViewItem" id="1024664267">
<string key="NSIdentifier">1</string>
<object class="NSView" key="NSView" id="412364894">
- <reference key="NSNextResponder" ref="838559838"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -78,7 +74,7 @@
<string key="NSContents">Use Current</string>
<object class="NSFont" key="NSSupport" id="445696277">
<string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
+ <double key="NSSize">1.300000e+01</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="810089388"/>
@@ -150,7 +146,7 @@
<string key="NSContents">Toolbar:</string>
<object class="NSFont" key="NSSupport" id="290273273">
<string key="NSName">LucidaGrande-Bold</string>
- <double key="NSSize">13</double>
+ <double key="NSSize">1.300000e+01</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="881113898"/>
@@ -160,7 +156,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="854057974">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="748094473">
@@ -248,8 +244,8 @@
<int key="NSCellFlags2">0</int>
<string key="NSContents">Restore the pages that were open last</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="1016627403"/>
<int key="NSTag">1</int>
+ <reference key="NSControlView" ref="1016627403"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">128</int>
<object class="NSImage" key="NSNormalImage">
@@ -259,7 +255,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <integer value="0" id="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -285,7 +281,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw
cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -357,8 +353,8 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Open the following pages:</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="1016627403"/>
<int key="NSTag">2</int>
+ <reference key="NSControlView" ref="1016627403"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">128</int>
<object class="NSImage" key="NSNormalImage">
@@ -368,7 +364,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -394,7 +390,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAABEcAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAARHGFw
cGwCAAAAbW50clJHQiBYWVogB9kAAgADABEABQAfYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAPbWAAEAAAAA0y1hcHBsTYFxS94VjCFH/cYlpD4aTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -498,7 +494,7 @@ rwAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4sIDIwMDkAA</bytes
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -524,7 +520,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
@@ -611,8 +607,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Open this page:</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="743261621"/>
<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">
@@ -622,7 +618,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -648,7 +644,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw
cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -731,7 +727,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -757,7 +753,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
@@ -878,16 +874,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="1005813658">
- <double key="NSWidth">279</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
+ <double key="NSWidth">2.790000e+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">11</double>
+ <double key="NSSize">1.100000e+01</double>
<int key="NSfFlags">3100</int>
</object>
<object class="NSColor" key="NSBackgroundColor">
@@ -921,8 +917,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTableView" ref="165250101"/>
</object>
</object>
- <double key="NSIntercellSpacingWidth">3</double>
- <double key="NSIntercellSpacingHeight">2</double>
+ <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>
@@ -933,15 +929,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
- <double key="NSRowHeight">17</double>
+ <double key="NSRowHeight">1.700000e+01</double>
<int key="NSTvFlags">-901775360</int>
- <reference key="NSDelegate"/>
- <reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">4</int>
<int key="NSDraggingSourceMaskForLocal">15</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 1}, {282, 63}}</string>
@@ -959,7 +952,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="54854923"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.98684210000000006</double>
+ <double key="NSPercent">9.868421e-01</double>
</object>
<object class="NSScroller" id="757862790">
<reference key="NSNextResponder" ref="54854923"/>
@@ -969,7 +962,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="54854923"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.57142859999999995</double>
+ <double key="NSPercent">5.714286e-01</double>
</object>
</object>
<string key="NSFrame">{{171, 302}, {284, 65}}</string>
@@ -997,7 +990,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSButtonFlags2">129</int>
<object class="NSFont" key="NSAlternateImage" id="497093453">
<string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
+ <double key="NSSize">1.300000e+01</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSAlternateContents"/>
@@ -1018,7 +1011,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<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">11</double>
+ <double key="NSSize">1.100000e+01</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="402804707"/>
@@ -1080,7 +1073,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {513, 453}}</string>
- <reference key="NSSuperview" ref="838559838"/>
</object>
<string key="NSLabel">Basics</string>
<reference key="NSColor" ref="592613688"/>
@@ -1089,7 +1081,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="614928174">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="712581699">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="838559838"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1124,8 +1116,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Offer to save passwords</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="1019357609"/>
<int key="NSTag">1</int>
+ <reference key="NSControlView" ref="1019357609"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">128</int>
<reference key="NSAlternateImage" ref="1028460734"/>
@@ -1149,7 +1141,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -1175,7 +1167,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw
cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1258,7 +1250,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -1284,7 +1276,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
@@ -1394,7 +1386,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButtonCell" key="NSCell" id="325720834">
<int key="NSCellFlags">604110336</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Import Data…</string>
+ <string type="base64-UTF8" key="NSContents">SW1wb3J0IERhdGHigKY</string>
<reference key="NSSupport" ref="445696277"/>
<reference key="NSControlView" ref="885386403"/>
<int key="NSButtonFlags">-2038284033</int>
@@ -1414,7 +1406,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButtonCell" key="NSCell" id="551321318">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Clear Browsing Data…</string>
+ <string type="base64-UTF8" key="NSContents">Q2xlYXIgQnJvd3NpbmcgRGF0YeKApg</string>
<reference key="NSSupport" ref="445696277"/>
<reference key="NSControlView" ref="987908490"/>
<int key="NSButtonFlags">-2038284033</int>
@@ -1440,8 +1432,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Save text from forms on web pages</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="854747859"/>
<int key="NSTag">1</int>
+ <reference key="NSControlView" ref="854747859"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">128</int>
<reference key="NSAlternateImage" ref="1028460734"/>
@@ -1465,7 +1457,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -1491,7 +1483,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw
cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1574,7 +1566,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
+ <reference ref="8"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
@@ -1600,7 +1592,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
@@ -1620,13 +1612,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="423027085">
<reference key="NSNextResponder" ref="712581699"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{165, 82}, {129, 32}}</string>
+ <string key="NSFrame">{{165, 83}, {129, 32}}</string>
<reference key="NSSuperview" ref="712581699"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="309945174">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Get Themes…</string>
+ <string type="base64-UTF8" key="NSContents">R2V0IFRoZW1lc+KApg</string>
<reference key="NSSupport" ref="445696277"/>
<reference key="NSControlView" ref="423027085"/>
<int key="NSButtonFlags">-2038284033</int>
@@ -1637,40 +1629,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSPopUpButton" id="236714966">
+ <object class="NSButton" id="865039969">
<reference key="NSNextResponder" ref="712581699"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{168, 119}, {206, 26}}</string>
+ <string key="NSFrame">{{165, 115}, {183, 32}}</string>
<reference key="NSSuperview" ref="712581699"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="223144024">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">2048</int>
+ <object class="NSButtonCell" key="NSCell" id="270492768">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Reset to default theme</string>
<reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="236714966"/>
- <int key="NSButtonFlags">109199615</int>
+ <reference key="NSControlView" ref="865039969"/>
+ <int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <nil key="NSMenuItem"/>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="149030252">
- <string key="NSTitle">OtherViews</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <int key="NSSelectedIndex">-1</int>
- <int key="NSPreferredEdge">1</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">2</int>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrame">{{10, 33}, {513, 453}}</string>
+ <reference key="NSSuperview" ref="838559838"/>
</object>
<string key="NSLabel">Personal Stuff</string>
<reference key="NSColor" ref="592613688"/>
@@ -1716,8 +1697,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="14278481"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1</double>
- <double key="NSPercent">0.9636363</double>
+ <double key="NSCurValue">1.000000e+00</double>
+ <double key="NSPercent">9.636363e-01</double>
</object>
<object class="NSScroller" id="470087648">
<reference key="NSNextResponder" ref="14278481"/>
@@ -1727,7 +1708,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="14278481"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.50602409999999998</double>
+ <double key="NSPercent">5.060241e-01</double>
</object>
</object>
<string key="NSFrame">{{17, 64}, {479, 386}}</string>
@@ -1766,14 +1747,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTabView" ref="838559838"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="1024664267"/>
+ <reference key="NSSelectedTabViewItem" ref="614928174"/>
<reference key="NSFont" ref="445696277"/>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="412364894"/>
+ <reference ref="712581699"/>
</object>
</object>
</object>
@@ -1781,7 +1762,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSCustomView" id="1016273328">
<nil key="NSNextResponder"/>
@@ -1830,7 +1811,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextFieldCell" key="NSCell" id="786981193">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">272629760</int>
- <string key="NSContents">If you have chosen to open certain file types automatically after downloading, you can clear these settings so that downloaded files don't open automatically.</string>
+ <string type="base64-UTF8" key="NSContents">SWYgeW91IGhhdmUgY2hvc2VuIHRvIG9wZW4gY2VydGFpbiBmaWxlIHR5cGVzIGF1dG9tYXRpY2FsbHkg
+YWZ0ZXIgZG93bmxvYWRpbmcsIHlvdSBjYW4gY2xlYXIgdGhlc2Ugc2V0dGluZ3Mgc28gdGhhdCBkb3du
+bG9hZGVkIGZpbGVzIGRvbid0IG9wZW4gYXV0b21hdGljYWxseS4</string>
<reference key="NSSupport" ref="497093453"/>
<reference key="NSControlView" ref="412658410"/>
<reference key="NSBackgroundColor" ref="592613688"/>
@@ -1846,7 +1829,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextFieldCell" key="NSCell" id="494850700">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">272629760</int>
- <string key="NSContents">The following web services may be used to improve your browsing experience — you may optionally disable these services.</string>
+ <string type="base64-UTF8" key="NSContents">VGhlIGZvbGxvd2luZyB3ZWIgc2VydmljZXMgbWF5IGJlIHVzZWQgdG8gaW1wcm92ZSB5b3VyIGJyb3dz
+aW5nIGV4cGVyaWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2Vz
+Lg</string>
<reference key="NSSupport" ref="497093453"/>
<reference key="NSControlView" ref="1043699198"/>
<reference key="NSBackgroundColor" ref="592613688"/>
@@ -2076,7 +2061,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButtonCell" key="NSCell" id="441531293">
<int key="NSCellFlags">604110336</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Show Cookies…</string>
+ <string type="base64-UTF8" key="NSContents">U2hvdyBDb29raWVz4oCmA</string>
<reference key="NSSupport" ref="445696277"/>
<reference key="NSControlView" ref="1054376288"/>
<int key="NSButtonFlags">-2038284033</int>
@@ -2239,7 +2224,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">268</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="set.sortedObjects">
+ <object class="NSMutableArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple URL pasteboard type</string>
<string>NSFilenamesPboardType</string>
@@ -2291,7 +2276,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButtonCell" key="NSCell" id="526979400">
<int key="NSCellFlags">604110336</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Change Font and Language Settings…</string>
+ <string type="base64-UTF8" key="NSContents">Q2hhbmdlIEZvbnQgYW5kIExhbmd1YWdlIFNldHRpbmdz4oCmA</string>
<reference key="NSSupport" ref="445696277"/>
<reference key="NSControlView" ref="777041502"/>
<int key="NSButtonFlags">-2038284033</int>
@@ -2554,7 +2539,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSKeyPath">defaultBrowserText</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <boolean value="NO" key="NS.object.0"/>
+ <boolean value="NO" key="NS.object.0" id="6"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
@@ -2598,7 +2583,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSKeyPath">passwordManagerEnabledIndex</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <boolean value="NO" key="NS.object.0"/>
+ <reference key="NS.object.0" ref="6"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
@@ -2618,7 +2603,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSKeyPath">formAutofillEnabledIndex</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <boolean value="NO" key="NS.object.0"/>
+ <reference key="NS.object.0" ref="6"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
@@ -2899,39 +2884,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="connectionID">459</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">contentValues: availableThemes</string>
- <reference key="source" ref="236714966"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector" id="812504652">
- <reference key="NSSource" ref="236714966"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">contentValues: availableThemes</string>
- <string key="NSBinding">contentValues</string>
- <string key="NSKeyPath">availableThemes</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">468</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">selectedIndex: currentTheme</string>
- <reference key="source" ref="236714966"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="236714966"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">selectedIndex: currentTheme</string>
- <string key="NSBinding">selectedIndex</string>
- <string key="NSKeyPath">currentTheme</string>
- <reference key="NSPreviousConnector" ref="812504652"/>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">470</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">manageSearchEngines:</string>
<reference key="source" ref="1001"/>
@@ -2939,32 +2891,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">471</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">resetThemeToDefault:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="865039969"/>
+ </object>
+ <int key="connectionID">474</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object" ref="0"/>
+ <object class="NSArray" key="object" id="420192856">
+ <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="0"/>
- <string key="objectName">File's Owner</string>
+ <reference key="parent" ref="420192856"/>
+ <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="0"/>
+ <reference key="parent" ref="420192856"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
- <reference key="parent" ref="0"/>
+ <reference key="parent" ref="420192856"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@@ -2974,7 +2936,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="408649839"/>
</object>
- <reference key="parent" ref="0"/>
+ <reference key="parent" ref="420192856"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
@@ -3048,8 +3010,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="885386403"/>
<reference ref="987908490"/>
<reference ref="854747859"/>
+ <reference ref="865039969"/>
<reference ref="423027085"/>
- <reference ref="236714966"/>
</object>
<reference key="parent" ref="614928174"/>
</object>
@@ -3332,7 +3294,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="777041502"/>
<reference ref="346222444"/>
</object>
- <reference key="parent" ref="0"/>
+ <reference key="parent" ref="420192856"/>
<string key="objectName">Under The Hood</string>
</object>
<object class="IBObjectRecord">
@@ -3916,7 +3878,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBObjectRecord">
<int key="objectID">358</int>
<reference key="object" ref="775776152"/>
- <reference key="parent" ref="0"/>
+ <reference key="parent" ref="420192856"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">362</int>
@@ -3947,7 +3909,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBObjectRecord">
<int key="objectID">380</int>
<reference key="object" ref="495015235"/>
- <reference key="parent" ref="0"/>
+ <reference key="parent" ref="420192856"/>
<string key="objectName">CustomHomePages Array Controller</string>
</object>
<object class="IBObjectRecord">
@@ -4041,7 +4003,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBObjectRecord">
<int key="objectID">449</int>
<reference key="object" ref="650617813"/>
- <reference key="parent" ref="0"/>
+ <reference key="parent" ref="420192856"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">457</int>
@@ -4058,36 +4020,24 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="parent" ref="423027085"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">460</int>
- <reference key="object" ref="236714966"/>
+ <int key="objectID">472</int>
+ <reference key="object" ref="865039969"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="223144024"/>
+ <reference ref="270492768"/>
</object>
<reference key="parent" ref="712581699"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">461</int>
- <reference key="object" ref="223144024"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="149030252"/>
- </object>
- <reference key="parent" ref="236714966"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">462</int>
- <reference key="object" ref="149030252"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="parent" ref="223144024"/>
+ <int key="objectID">473</int>
+ <reference key="object" ref="270492768"/>
+ <reference key="parent" ref="865039969"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
+ <object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
@@ -4196,12 +4146,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>45.IBPluginDependency</string>
<string>457.IBPluginDependency</string>
<string>458.IBPluginDependency</string>
- <string>460.IBPluginDependency</string>
- <string>461.IBPluginDependency</string>
- <string>462.CustomClassName</string>
- <string>462.IBEditorWindowLastContentRect</string>
- <string>462.IBPluginDependency</string>
<string>47.IBPluginDependency</string>
+ <string>472.IBPluginDependency</string>
+ <string>473.IBPluginDependency</string>
<string>48.IBPluginDependency</string>
<string>49.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
@@ -4310,9 +4257,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{569, 323}, {559, 515}}</string>
- <string>{{569, 323}, {559, 515}}</string>
- <boolean value="NO"/>
+ <string>{{784, 543}, {559, 515}}</string>
+ <string>{{784, 543}, {559, 515}}</string>
+ <reference ref="6"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4360,9 +4307,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>AutoseparatingMenu</string>
- <string>{{240, 157}, {190, 6}}</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>
@@ -4414,7 +4358,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@@ -4422,31 +4368,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">471</int>
+ <int key="maxID">474</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">AutoseparatingMenu</string>
- <string key="superclassName">NSMenu</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/autoseparating_menu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">GTMUILocalizer</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
+ <object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>otherObjectToLocalize_</string>
<string>owner_</string>
@@ -4491,62 +4431,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addHomepage:</string>
- <string>clearData:</string>
- <string>importData:</string>
- <string>makeDefaultBrowser:</string>
- <string>removeSelectedHomepages:</string>
- <string>showPreferences:</string>
- <string>showSavedPasswords:</string>
- <string>themesGallery:</string>
- <string>useCurrentPagesAsHomepage:</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>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>advancedScroller_</string>
- <string>advancedView_</string>
- <string>customPagesArrayController_</string>
- <string>tabView_</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSScrollView</string>
- <string>NSView</string>
- <string>NSArrayController</string>
- <string>NSTabView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/preferences_window_controller.h</string>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">PreferencesWindowController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
+ <object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addHomepage:</string>
<string>clearData:</string>
@@ -4554,6 +4439,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>makeDefaultBrowser:</string>
<string>manageSearchEngines:</string>
<string>removeSelectedHomepages:</string>
+ <string>resetThemeToDefault:</string>
<string>showPreferences:</string>
<string>showSavedPasswords:</string>
<string>themesGallery:</string>
@@ -4571,11 +4457,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
+ <object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>advancedScroller_</string>
<string>advancedView_</string>
@@ -4591,22 +4478,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../browser/cocoa/preferences_window_controller.h</string>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/preferences_window_controller.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1050" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
diff --git a/chrome/browser/cocoa/autoseparating_menu.h b/chrome/browser/cocoa/autoseparating_menu.h
deleted file mode 100644
index c350561..0000000
--- a/chrome/browser/cocoa/autoseparating_menu.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Cocoa/Cocoa.h>
-
-// By default, NSPopUpButton doesn't allow separator items in its menus. This is
-// an NSMenu subclass that automatically adds separator items when presented
-// with a @"-" string, so it can be set up in the nib to be the menu class.
-@interface AutoseparatingMenu : NSMenu {
-}
-
-@end
diff --git a/chrome/browser/cocoa/autoseparating_menu.m b/chrome/browser/cocoa/autoseparating_menu.m
deleted file mode 100644
index e0f36a7..0000000
--- a/chrome/browser/cocoa/autoseparating_menu.m
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "chrome/browser/cocoa/autoseparating_menu.h"
-
-@implementation AutoseparatingMenu
-
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString
- action:(SEL)aSelector
- keyEquivalent:(NSString *)keyEquiv
- atIndex:(NSInteger)index {
- if ([aString isEqualToString:@"-"]) {
- NSMenuItem* separator = [NSMenuItem separatorItem];
- [self insertItem:separator
- atIndex:index];
- return separator;
- } else {
- return [super insertItemWithTitle:aString
- action:aSelector
- keyEquivalent:keyEquiv
- atIndex:index];
- }
-}
-
-@end
diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h
index 2e9ed7f..7b333ee 100644
--- a/chrome/browser/cocoa/preferences_window_controller.h
+++ b/chrome/browser/cocoa/preferences_window_controller.h
@@ -48,8 +48,6 @@ class Profile;
// User Data panel
BooleanPrefMember askSavePasswords_;
BooleanPrefMember formAutofill_;
- scoped_nsobject<NSMutableArray> themeIds_;
- int themeMenuOffset_;
// Under the hood panel
IBOutlet NSView* advancedView_;
@@ -81,8 +79,7 @@ class Profile;
- (IBAction)showSavedPasswords:(id)sender;
- (IBAction)importData:(id)sender;
- (IBAction)clearData:(id)sender;
-- (NSArray*)availableThemes;
-@property int currentTheme;
+- (IBAction)resetThemeToDefault:(id)sender;
- (IBAction)themesGallery:(id)sender;
// Usable from cocoa bindings to hook up the custom home pages table.
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index e5146bd..26a82bb 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -641,80 +641,9 @@ const int kDisabledIndex = 1;
[controller runModalDialog];
}
-- (NSArray*)availableThemes {
- const ExtensionList* extensions =
- profile_->GetExtensionsService()->extensions();
-
- NSMutableArray* themes = [NSMutableArray array];
-
- for (size_t i = 0; i < extensions->size(); ++i) {
- Extension* extension = extensions->at(i);
- if (!extension->IsTheme())
- continue;
-
- NSDictionary* theme =
- [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String:extension->name().c_str()], @"name",
- [NSString stringWithUTF8String:extension->id().c_str()], @"id",
- nil];
- [themes addObject:theme];
- }
-
- NSSortDescriptor* sortDescriptor =
- [[[NSSortDescriptor alloc] initWithKey:@"name"
- ascending:YES
- selector:@selector(localizedCompare:)]
- autorelease];
-
- [themes sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]];
-
- NSMutableArray* themeNames = [NSMutableArray array];
- NSMutableArray* themeIds = [NSMutableArray array];
-
- for (NSDictionary* themeDict in themes) {
- [themeNames addObject:[themeDict objectForKey:@"name"]];
- [themeIds addObject:[themeDict objectForKey:@"id"]];
- }
-
- themeMenuOffset_ = 0;
- if ([themeNames count] > 0) {
- [themeNames insertObject:@"-" atIndex:0];
- ++themeMenuOffset_;
- }
- NSString* defaultLabel =
- [NSString stringWithUTF8String:
- l10n_util::GetStringUTF8(IDS_THEMES_DEFAULT_THEME_LABEL).c_str()];
- [themeNames insertObject:defaultLabel atIndex:0];
- ++themeMenuOffset_;
-
- themeIds_.reset([themeIds retain]);
- return themeNames;
-}
-
-- (int)currentTheme {
- const Extension* theme = profile_->GetTheme();
-
- if (theme) {
- NSString* themeId = [NSString stringWithUTF8String:theme->id().c_str()];
- return [themeIds_.get() indexOfObject:themeId] + themeMenuOffset_;
- }
-
- return 0;
-}
-
-- (void)setCurrentTheme:(int)newTheme {
- newTheme -= themeMenuOffset_;
-
- if (newTheme < 0) {
- [self recordUserAction:L"Options_ThemesReset"];
- profile_->ClearTheme();
- } else {
- NSString* themeId = [themeIds_.get() objectAtIndex:newTheme];
- Extension* extension =
- profile_->GetExtensionsService()->
- GetExtensionById([themeId UTF8String]);
- profile_->SetTheme(extension);
- }
+- (IBAction)resetThemeToDefault:(id)sender {
+ [self recordUserAction:L"Options_ThemesReset"];
+ profile_->ClearTheme();
}
- (IBAction)themesGallery:(id)sender {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b9167b2..227cd39 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -862,8 +862,6 @@
'browser/cocoa/autocomplete_text_field_cell.mm',
'browser/cocoa/autocomplete_text_field_editor.h',
'browser/cocoa/autocomplete_text_field_editor.mm',
- 'browser/cocoa/autoseparating_menu.h',
- 'browser/cocoa/autoseparating_menu.m',
'browser/cocoa/back_forward_menu_controller.h',
'browser/cocoa/back_forward_menu_controller.mm',
'browser/cocoa/background_gradient_view.h',
generated by cgit v1.1 at 2025-01-20 10:32:04 +0000