diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 08:32:55 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 08:32:55 +0000 |
| commit | 0f403b49c078588b57ba52d11e256850349ef5fc (patch) | |
| tree | a2c8b436bfd59a64e08527211077f7aeaad7a06a | |
| parent | d71c0d83f0e893de9b4ef707dcaaf3b766816122 (diff) | |
| download | chromium_src-0f403b49c078588b57ba52d11e256850349ef5fc.zip chromium_src-0f403b49c078588b57ba52d11e256850349ef5fc.tar.gz chromium_src-0f403b49c078588b57ba52d11e256850349ef5fc.tar.bz2 | |
Implement policy for disabling auto fill.
This introduces a new policy setting named AutoFillEnabled that administrators
can use to switch off the auto fill feature. The UI adjustments disable the
autofill button and dialog in the preferences dialog appropriate.
Preferences.xib change: Bind enabled state of the auto fill button to
autoFillSettingsButtonEnabled @property.
AutoFillDialog.xib change: Bind enabled state of the auto fill enabled checkbox and save button
to the autoFillEnabledAvailable and saveEnabled @properties, respectively.
BUG=49611
TEST=autofill_dialog_controller_mac_unittest.mm, manual testing
Review URL: http://codereview.chromium.org/3140024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57302 0039d316-1c4b-4281-b951-d872f2087c98
25 files changed, 1893 insertions, 155 deletions
diff --git a/chrome/app/nibs/AutoFillDialog.xib b/chrome/app/nibs/AutoFillDialog.xib index f2fdbee..01d8b2b 100644 --- a/chrome/app/nibs/AutoFillDialog.xib +++ b/chrome/app/nibs/AutoFillDialog.xib @@ -3,12 +3,12 @@ <data> <int key="IBDocument.SystemTarget">1050</int> <string key="IBDocument.SystemVersion">10F569</string> - <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.InterfaceBuilderVersion">788</string> <string key="IBDocument.AppKitVersion">1038.29</string> <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">762</string> + <string key="NS.object.0">788</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -793,6 +793,46 @@ </object> <int key="connectionID">219</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: autoFillManaged</string> + <reference key="source" ref="867547894"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="867547894"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: autoFillManaged</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">autoFillManaged</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">225</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: autoFillManagedAndDisabled</string> + <reference key="source" ref="152555007"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="152555007"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: autoFillManagedAndDisabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">autoFillManagedAndDisabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">228</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1152,7 +1192,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">219</int> + <int key="maxID">229</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1183,6 +1223,50 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addNewAddress:</string> + <string>addNewCreditCard:</string> + <string>cancel:</string> + <string>deleteSelection:</string> + <string>editSelection:</string> + <string>openHelp:</string> + <string>save:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addNewAddress:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">addNewCreditCard:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">cancel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">deleteSelection:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">editSelection:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">openHelp:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">save:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -1196,6 +1280,25 @@ <string>AutoFillTableView</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>editButton_</string> + <string>tableView_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">editButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">tableView_</string> + <string key="candidateClassName">AutoFillTableView</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/autofill/autofill_dialog_controller_mac.h</string> @@ -1235,6 +1338,30 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">otherObjectToLocalize_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">owner_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">yetAnotherObjectToLocalize_</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> @@ -1277,6 +1404,13 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/view_id_util.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -1851,6 +1985,27 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string> </object> </object> @@ -1977,6 +2132,13 @@ <string key="NS.key.0">showWindow:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">showWindow:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">showWindow:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index cbda12f..da66a74 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L31a</string> - <string key="IBDocument.InterfaceBuilderVersion">680</string> - <string key="IBDocument.AppKitVersion">949.54</string> - <string key="IBDocument.HIToolboxVersion">353.00</string> + <string key="IBDocument.SystemVersion">10F569</string> + <string key="IBDocument.InterfaceBuilderVersion">788</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">788</string> + </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="482"/> @@ -16,7 +20,7 @@ </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys" id="0"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <object class="NSMutableArray" key="dict.values"> @@ -54,7 +58,7 @@ <int key="NSToolbarSizeMode">1</int> <object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>89B72B0D-82E6-4116-9E65-052CEF41D839</string> <string>BB0BB13B-2005-4DF0-9802-48E954305230</string> @@ -146,14 +150,14 @@ <bool key="EncodedWithXMLCoder">YES</bool> </object> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <object class="NSView" key="NSWindowView" id="408649839"> <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <string key="NSFrameSize">{450, 286}</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> </object> <object class="NSCustomView" id="1016273328"> <nil key="NSNextResponder"/> @@ -172,7 +176,7 @@ <string key="NSContents">^IDS_OPTIONS_TABS_TO_LINKS_PREF</string> <object class="NSFont" key="NSSupport" id="445696277"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="596669929"/> @@ -223,7 +227,7 @@ <string key="NSContents">^IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY</string> <object class="NSFont" key="NSSupport" id="290273273"> <string key="NSName">LucidaGrande-Bold</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="1032231978"/> @@ -234,7 +238,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="854057974"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="748094473"> @@ -276,7 +280,7 @@ <string key="NSContents">^IDS_OPTIONS_AUTOOPENFILETYPES_INFO</string> <object class="NSFont" key="NSSupport" id="497093453"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="412658410"/> @@ -504,7 +508,7 @@ <int key="NSvFlags">266</int> <object class="NSMutableSet" key="NSDragTypes"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="set.sortedObjects"> + <object class="NSArray" key="set.sortedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <string>Apple URL pasteboard type</string> <string>NSFilenamesPboardType</string> @@ -801,8 +805,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">^IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION</string> <reference key="NSSupport" ref="445696277"/> - <int key="NSTag">1</int> <reference key="NSControlView" ref="1016627403"/> + <int key="NSTag">1</int> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -812,7 +816,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="0" id="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -838,10 +842,10 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -910,8 +914,8 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes> <int key="NSCellFlags2">0</int> <string key="NSContents">^IDS_OPTIONS_STARTUP_SHOW_PAGES</string> <reference key="NSSupport" ref="445696277"/> - <int key="NSTag">2</int> <reference key="NSControlView" ref="1016627403"/> + <int key="NSTag">2</int> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -921,7 +925,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -947,7 +951,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAABEcAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAARHGFw cGwCAAAAbW50clJHQiBYWVogB9kAAgADABEABQAfYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsTYFxS94VjCFH/cYlpD4aTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1051,7 +1055,7 @@ rwAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4sIDIwMDkAA</bytes <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1077,7 +1081,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -1189,16 +1193,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <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> + <double key="NSWidth">302</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</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> + <double key="NSSize">11</double> <int key="NSfFlags">3100</int> </object> <object class="NSColor" key="NSBackgroundColor"> @@ -1232,8 +1236,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSTableView" ref="165250101"/> </object> </object> - <double key="NSIntercellSpacingWidth">3.000000e+00</double> - <double key="NSIntercellSpacingHeight">2.000000e+00</double> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="571857138"/> <object class="NSColor" key="NSGridColor"> <int key="NSColorSpace">6</int> @@ -1244,12 +1248,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bytes key="NSWhite">MC41AA</bytes> </object> </object> - <double key="NSRowHeight">1.700000e+01</double> + <double key="NSRowHeight">17</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}, {305, 63}}</string> @@ -1267,7 +1274,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="54854923"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">9.868421e-01</double> + <double key="NSPercent">0.98684210000000006</double> </object> <object class="NSScroller" id="757862790"> <reference key="NSNextResponder" ref="54854923"/> @@ -1277,7 +1284,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="54854923"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">5.714286e-01</double> + <double key="NSPercent">0.57142859999999995</double> </object> </object> <string key="NSFrame">{{213, 298}, {307, 65}}</string> @@ -1361,8 +1368,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <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="NSTag">1</int> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -1372,7 +1379,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1398,10 +1405,10 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -1481,7 +1488,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1507,7 +1514,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -1680,7 +1687,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">1.100000e+01</double> + <double key="NSSize">11</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="402804707"/> @@ -1763,8 +1770,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSCellFlags2">0</int> <string key="NSContents">^IDS_OPTIONS_PASSWORDS_ASKTOSAVE</string> <reference key="NSSupport" ref="445696277"/> - <int key="NSTag">1</int> <reference key="NSControlView" ref="1019357609"/> + <int key="NSTag">1</int> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <reference key="NSAlternateImage" ref="1028460734"/> @@ -1788,7 +1795,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1814,10 +1821,10 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -1897,7 +1904,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1923,7 +1930,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -2230,8 +2237,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSSuperview" ref="14278481"/> <reference key="NSTarget" ref="14278481"/> <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1.000000e+00</double> - <double key="NSPercent">9.636363e-01</double> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.9636363</double> </object> <object class="NSScroller" id="470087648"> <reference key="NSNextResponder" ref="14278481"/> @@ -2241,7 +2248,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="14278481"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">5.060241e-01</double> + <double key="NSPercent">0.50602409999999998</double> </object> </object> <string key="NSFrame">{{-1, 60}, {542, 404}}</string> @@ -2296,7 +2303,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">256</int> <object class="NSMutableSet" key="NSDragTypes"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="set.sortedObjects"> + <object class="NSArray" key="set.sortedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <string>Apple PDF pasteboard type</string> <string>Apple PICT pasteboard type</string> @@ -2576,7 +2583,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" id="6"/> + <boolean value="NO" key="NS.object.0"/> </object> <int key="NSNibBindingConnectorVersion">2</int> </object> @@ -2612,7 +2619,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="NSKeyPath">passwordManagerEnabledIndex</string> <object class="NSDictionary" key="NSOptions"> <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string> - <reference key="NS.object.0" ref="6"/> + <boolean value="NO" key="NS.object.0"/> </object> <int key="NSNibBindingConnectorVersion">2</int> </object> @@ -3842,6 +3849,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: autoFillSettingsButtonEnabled</string> + <reference key="source" ref="501995472"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="501995472"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: autoFillSettingsButtonEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">autoFillSettingsButtonEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">717</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> <string key="label">enabled: proxiesConfigureButtonEnabled</string> <reference key="source" ref="383918134"/> <reference key="destination" ref="1001"/> @@ -3854,7 +3877,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">717</int> + <int key="connectionID">718</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -3862,28 +3885,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="442961443"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="object" ref="0"/> <reference key="children" ref="1000"/> <nil key="parent"/> </object> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="1001"/> - <reference key="parent" ref="442961443"/> - <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="1003"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="1004"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> @@ -3894,7 +3915,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="408649839"/> <reference ref="530275816"/> </object> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">4</int> @@ -3937,7 +3958,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="860741341"/> <reference ref="514356928"/> </object> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Under the Hood Content</string> </object> <object class="IBObjectRecord"> @@ -4139,7 +4160,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">380</int> <reference key="object" ref="495015235"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">CustomHomePages Array Controller</string> </object> <object class="IBObjectRecord"> @@ -4201,7 +4222,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">449</int> <reference key="object" ref="650617813"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">476</int> @@ -4240,7 +4261,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="495791200"/> <reference ref="254133467"/> </object> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics View</string> </object> <object class="IBObjectRecord"> @@ -4265,7 +4286,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="1022040155"/> <reference ref="59469178"/> </object> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff View</string> </object> <object class="IBObjectRecord"> @@ -4414,7 +4435,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="14278481"/> <reference ref="926632778"/> </object> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Under the Hood View</string> </object> <object class="IBObjectRecord"> @@ -4472,12 +4493,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">505</int> <reference key="object" ref="385419425"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">510</int> <reference key="object" ref="305848829"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">515</int> @@ -4812,61 +4833,61 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">528</int> <reference key="object" ref="145618054"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics Startup Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">529</int> <reference key="object" ref="843942020"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics Home Page Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">530</int> <reference key="object" ref="423189874"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics Toolbar Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">531</int> <reference key="object" ref="609957344"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics Search Engine Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">532</int> <reference key="object" ref="376486454"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics Default Browser Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">541</int> <reference key="object" ref="317778625"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Basics Startup Group Cont</string> </object> <object class="IBObjectRecord"> <int key="objectID">559</int> <reference key="object" ref="325031373"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff Passwords Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">560</int> <reference key="object" ref="683074852"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff Autofill Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">561</int> <reference key="object" ref="481147379"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff Browser Data Group</string> </object> <object class="IBObjectRecord"> <int key="objectID">562</int> <reference key="object" ref="487772665"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff Themes Group</string> </object> <object class="IBObjectRecord"> @@ -4895,7 +4916,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">596</int> <reference key="object" ref="938815385"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">601</int> @@ -4942,7 +4963,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">610</int> <reference key="object" ref="821768455"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff Sync Group</string> </object> <object class="IBObjectRecord"> @@ -5093,7 +5114,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="846805293"/> <reference ref="555840669"/> </object> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Managed Prefs Banner</string> </object> <object class="IBObjectRecord"> @@ -5127,7 +5148,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">699</int> <reference key="object" ref="78746495"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">703</int> @@ -5146,14 +5167,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBObjectRecord"> <int key="objectID">708</int> <reference key="object" ref="276476617"/> - <reference key="parent" ref="442961443"/> + <reference key="parent" ref="0"/> <string key="objectName">Personal Stuff Sync Group Cont</string> </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-1.IBPluginDependency</string> <string>-2.IBPluginDependency</string> @@ -5397,7 +5418,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{329, 154}, {450, 286}}</string> <string>{{329, 154}, {450, 286}}</string> - <reference ref="6"/> + <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5409,10 +5430,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <real value="0.000000e+00"/> + <real value="0.0"/> <reference ref="28651200"/> - <real value="0.000000e+00"/> - <real value="0.000000e+00"/> + <real value="0.0"/> + <real value="0.0"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5456,11 +5477,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES" id="5"/> + <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="5"/> + <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="5"/> + <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5501,10 +5522,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>HyperlinkButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <real value="0.000000e+00"/> + <real value="0.0"/> <reference ref="28651200"/> - <real value="0.000000e+00"/> - <real value="0.000000e+00"/> + <real value="0.0"/> + <real value="0.0"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5562,9 +5583,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -5572,15 +5591,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> </object> <nil key="sourceID"/> - <int key="maxID">714</int> + <int key="maxID">719</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -5598,7 +5615,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="superclassName">NSArray</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>object1_</string> <string>object2_</string> @@ -5615,6 +5632,40 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>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> + <object class="IBToOneOutletInfo"> + <string key="name">object1_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">object2_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">object3_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">object4_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">object5_</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">../third_party/GTM/AppKit/GTMIBArray.h</string> @@ -5633,7 +5684,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>otherObjectToLocalize_</string> <string>owner_</string> @@ -5646,6 +5697,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">otherObjectToLocalize_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">owner_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">yetAnotherObjectToLocalize_</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> @@ -5656,7 +5731,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>localizerOwner_</string> <string>localizer_</string> @@ -5669,6 +5744,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>localizerOwner_</string> + <string>localizer_</string> + <string>uiObject_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">localizerOwner_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">localizer_</string> + <string key="candidateClassName">GTMUILocalizer</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">uiObject_</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="255098441"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> @@ -5679,7 +5778,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="superclassName">NSView</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>viewToResize_</string> <string>viewToSlideAndResize_</string> @@ -5692,6 +5791,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>NSView</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>viewToResize_</string> + <string>viewToSlideAndResize_</string> + <string>viewToSlide_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">viewToResize_</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">viewToSlideAndResize_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">viewToSlide_</string> + <string key="candidateClassName">NSView</string> + </object> + </object> + </object> <reference key="sourceIdentifier" ref="255098441"/> </object> <object class="IBPartialClassDescription"> @@ -5738,6 +5861,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/view_id_util.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -5756,7 +5886,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addHomepage:</string> <string>browseDownloadLocation:</string> @@ -5813,9 +5943,143 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addHomepage:</string> + <string>browseDownloadLocation:</string> + <string>changeFontAndLanguageSettings:</string> + <string>clearData:</string> + <string>doSyncAction:</string> + <string>doSyncCustomize:</string> + <string>doSyncReauthentication:</string> + <string>importData:</string> + <string>makeDefaultBrowser:</string> + <string>manageSearchEngines:</string> + <string>openProxyPreferences:</string> + <string>privacyLearnMore:</string> + <string>removeSelectedHomepages:</string> + <string>resetAutoOpenFiles:</string> + <string>resetThemeToDefault:</string> + <string>resetToDefaults:</string> + <string>showAutoFillSettings:</string> + <string>showCertificates:</string> + <string>showContentSettings:</string> + <string>showPreferences:</string> + <string>showPrivacyDashboard:</string> + <string>showSavedPasswords:</string> + <string>themesGallery:</string> + <string>toolbarButtonSelected:</string> + <string>useCurrentPagesAsHomepage:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addHomepage:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">browseDownloadLocation:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">changeFontAndLanguageSettings:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">clearData:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSyncAction:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSyncCustomize:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSyncReauthentication:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">importData:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">makeDefaultBrowser:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">manageSearchEngines:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">openProxyPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">privacyLearnMore:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">removeSelectedHomepages:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetAutoOpenFiles:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetThemeToDefault:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetToDefaults:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showAutoFillSettings:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showCertificates:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showContentSettings:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showPrivacyDashboard:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showSavedPasswords:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">themesGallery:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toolbarButtonSelected:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">useCurrentPagesAsHomepage:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>autoFillSettingsButton_</string> <string>basicsGroupDefaultBrowser_</string> @@ -5884,6 +6148,170 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>NSView</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>autoFillSettingsButton_</string> + <string>basicsGroupDefaultBrowser_</string> + <string>basicsGroupHomePage_</string> + <string>basicsGroupSearchEngine_</string> + <string>basicsGroupStartup_</string> + <string>basicsGroupToolbar_</string> + <string>basicsView_</string> + <string>clearDataButton_</string> + <string>contentSettingsButton_</string> + <string>customPagesArrayController_</string> + <string>downloadLocationButton_</string> + <string>downloadLocationControl_</string> + <string>enableLoggingCheckbox_</string> + <string>managedPrefsBannerView_</string> + <string>managedPrefsBannerWarningImage_</string> + <string>personalStuffGroupAutofill_</string> + <string>personalStuffGroupBrowserData_</string> + <string>personalStuffGroupPasswords_</string> + <string>personalStuffGroupSync_</string> + <string>personalStuffGroupThemes_</string> + <string>personalStuffView_</string> + <string>privacyDashboardLink_</string> + <string>resetFileHandlersButton_</string> + <string>syncButton_</string> + <string>syncCustomizeButton_</string> + <string>syncLink_</string> + <string>syncStatus_</string> + <string>toolbar_</string> + <string>underTheHoodContentView_</string> + <string>underTheHoodScroller_</string> + <string>underTheHoodView_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">autoFillSettingsButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupDefaultBrowser_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupHomePage_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupSearchEngine_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupStartup_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsGroupToolbar_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">basicsView_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">clearDataButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">contentSettingsButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">customPagesArrayController_</string> + <string key="candidateClassName">NSArrayController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">downloadLocationButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">downloadLocationControl_</string> + <string key="candidateClassName">NSPathControl</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">enableLoggingCheckbox_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">managedPrefsBannerView_</string> + <string key="candidateClassName">VerticalGradientView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">managedPrefsBannerWarningImage_</string> + <string key="candidateClassName">NSImageView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupAutofill_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupBrowserData_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupPasswords_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupSync_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffGroupThemes_</string> + <string key="candidateClassName">NSArray</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">personalStuffView_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">privacyDashboardLink_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">resetFileHandlersButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncCustomizeButton_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncLink_</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">syncStatus_</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">toolbar_</string> + <string key="candidateClassName">NSToolbar</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">underTheHoodContentView_</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">underTheHoodScroller_</string> + <string key="candidateClassName">NSScrollView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">underTheHoodView_</string> + <string key="candidateClassName">NSView</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/cocoa/preferences_window_controller.h</string> @@ -5898,9 +6326,908 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> </object> + <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">NSActionCell</string> + <string key="superclassName">NSCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <string key="superclassName">NSResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="581942742"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="300886154"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="513890883"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArray</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSArray.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArray</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="560326091"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArray</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="220780160"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArray</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPathUtilities.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArray</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPredicate.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArray</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSSortDescriptor.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSArrayController</string> + <string key="superclassName">NSObjectController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSButton</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSButtonCell</string> + <string key="superclassName">NSActionCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSCell</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSControl</string> + <string key="superclassName">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1069835981"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSController</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSFormatter</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSImageCell</string> + <string key="superclassName">NSCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSImageView</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSImageView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMatrix</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMenu</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="640909986"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMenuItem</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="186229553"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMenuItemCell</string> + <string key="superclassName">NSButtonCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AddressBook.framework/Headers/ABActions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSAlert.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSAnimation.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="581942742"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="300886154"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="513890883"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="1069835981"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDatePickerCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="585324905"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSImage.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="640909986"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSRuleEditor.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSound.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSpeechRecognizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSpeechSynthesizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="991838625"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSText.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextStorage.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTokenField.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTokenFieldCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="65273196"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="313968404"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="789839613"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="53132708"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSConnection.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSError.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="560326091"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <reference key="sourceIdentifier" ref="220780160"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSMetadata.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPort.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSSpellServer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSStream.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">SecurityInterface.framework/Headers/SFCertificatePanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">SecurityInterface.framework/Headers/SFChooseIdentityPanel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObjectController</string> + <string key="superclassName">NSController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSObjectController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSPathCell</string> + <string key="superclassName">NSActionCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPathCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSPathControl</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPathControl.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSPopUpButton</string> + <string key="superclassName">NSButton</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSPopUpButtonCell</string> + <string key="superclassName">NSMenuItemCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSResponder</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSScrollView</string> + <string key="superclassName">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSScroller</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSScroller.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTableColumn</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTableView</string> + <string key="superclassName">NSControl</string> + <reference key="sourceIdentifier" ref="991838625"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTextField</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSTextFieldCell</string> + <string key="superclassName">NSActionCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSToolbar</string> + <string key="superclassName">NSObject</string> + <reference key="sourceIdentifier" ref="65273196"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSToolbarItem</string> + <string key="superclassName">NSObject</string> + <reference key="sourceIdentifier" ref="313968404"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSUserDefaultsController</string> + <string key="superclassName">NSController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <reference key="sourceIdentifier" ref="186229553"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <string key="superclassName">NSResponder</string> + <reference key="sourceIdentifier" ref="789839613"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <reference key="sourceIdentifier" ref="585324905"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <string key="superclassName">NSResponder</string> + <reference key="sourceIdentifier" ref="53132708"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindowController</string> + <string key="superclassName">NSResponder</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showWindow:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">showWindow:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">showWindow:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> + </object> + </object> + </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <integer value="1050" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <integer value="1050" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> + <integer value="3000" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSAddTemplate</string> + <string>NSAdvanced</string> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + <string>NSPreferencesGeneral</string> + <string>NSRemoveTemplate</string> + <string>NSSwitch</string> + <string>NSUser</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{8, 8}</string> + <string>{32, 32}</string> + <string>{9, 8}</string> + <string>{7, 2}</string> + <string>{32, 32}</string> + <string>{8, 8}</string> + <string>{15, 15}</string> + <string>{32, 32}</string> + </object> + </object> </data> </archive> diff --git a/chrome/app/policy/mac/app-Manifest.plist b/chrome/app/policy/mac/app-Manifest.plist index 2b4e553..4fb2e68 100644 --- a/chrome/app/policy/mac/app-Manifest.plist +++ b/chrome/app/policy/mac/app-Manifest.plist @@ -177,6 +177,20 @@ </dict> <dict> <key>pfm_name</key> + <string>AutoFillEnabled</string> + <key>pfm_description</key> + <string>This policy controls the AutoFill feature. If disabled, automatic form filling will not be available to the user. If not configured or enabled, users can turn on and configure AutoFill.</string> + <key>pfm_title</key> + <string>Enable AutoFill</string> + <key>pfm_targets</key> + <array> + <string>user-managed</string> + </array> + <key>pfm_type</key> + <string>boolean</string> + </dict> + <dict> + <key>pfm_name</key> <string>DisabledPlugins</string> <key>pfm_description</key> <string>This policy specifies a list of plugins that are disabled. The policy value is a comma-separated list of the names of plugins to be disabled.</string> diff --git a/chrome/app/policy/windows/adm/en-US/chrome.adm b/chrome/app/policy/windows/adm/en-US/chrome.adm index 62f27f7..357552b 100644 --- a/chrome/app/policy/windows/adm/en-US/chrome.adm +++ b/chrome/app/policy/windows/adm/en-US/chrome.adm @@ -105,6 +105,16 @@ CLASS MACHINE VALUEOFF NUMERIC 0
END POLICY
+ POLICY !!AutoFillEnabled
+ #if version >= 4
+ SUPPORTED !!SUPPORTED_WINXPSP2
+ #endif
+ EXPLAIN !!AutoFillEnabled_Explain
+ VALUENAME "AutoFillEnabled"
+ VALUEON NUMERIC 1
+ VALUEOFF NUMERIC 0
+ END POLICY
+
POLICY !!DisabledPlugins
#if version >= 4
SUPPORTED !!SUPPORTED_WINXPSP2
@@ -269,6 +279,10 @@ PasswordManagerEnabled_Explain="Enables saving passwords and using saved passwor If you enable this setting, users can have Google Chrome memorize passwords and provide them automatically the next time you log into a site.\n\n\
If you disable this setting, users are not able to save passwords or use already saved passwords.\n\n\
If you enable or disable this setting, users cannot change or override this setting in Google Chrome."
+AutoFillEnabled="Enable AutoFill"
+AutoFillEnabled_Explain="Enables the AutoFill feature.\n\n\
+If you disable this setting, the AutoFill feature will not be available to users.\n\n\
+If you enable or do not configure this setting, users can turn on and configure AutoFill."
DisabledPlugins="Specify a list of plugins that are disabled"
DisabledPlugins_Explain="Specifies a list of plugins that are disabled in Google Chrome and prevents users from changing this setting. The value is a comma-separated list of the names of plugins to be disabled.\n\n\
If you enable this setting, the specified list of plugins is never used in Google Chrome. The plugins are marked as disabled in 'about:plugins' and users are not able to enable them."
diff --git a/chrome/app/policy/windows/admx/chrome.admx b/chrome/app/policy/windows/admx/chrome.admx index 5d908c1..4e8b825 100644 --- a/chrome/app/policy/windows/admx/chrome.admx +++ b/chrome/app/policy/windows/admx/chrome.admx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<policyDefinitions revision="1.0" schemaVersion="1.0">
<policyNamespaces>
- <target prefix="fullarmor" namespace="FullArmor.0ed4732f-0cd4-46eb-884e-fd5e736e5a97" />
+ <target prefix="fullarmor" namespace="FullArmor.9a299da5-c137-4961-be67-d0354b8b3037" />
<using prefix="windows" namespace="Microsoft.Policies.Windows" />
</policyNamespaces>
<supersededAdm fileName="D:\src\chromium\src\chrome\app\policy\windows\adm\en-US\chrome.adm" />
@@ -105,6 +105,16 @@ <decimal value="0" />
</disabledValue>
</policy>
+ <policy name="AutoFillEnabled" class="Machine" displayName="$(string.AutoFillEnabled)" explainText="$(string.AutoFillEnabled_Explain)" presentation="$(presentation.AutoFillEnabled)" key="Software\Policies\Google\Chrome" valueName="AutoFillEnabled">
+ <parentCategory ref="googlechrome" />
+ <supportedOn ref="SUPPORTED_WINXPSP2" />
+ <enabledValue>
+ <decimal value="1" />
+ </enabledValue>
+ <disabledValue>
+ <decimal value="0" />
+ </disabledValue>
+ </policy>
<policy name="DisabledPlugins" class="Machine" displayName="$(string.DisabledPlugins)" explainText="$(string.DisabledPlugins_Explain)" presentation="$(presentation.DisabledPlugins)" key="Software\Policies\Google\Chrome" valueName="DisabledPlugins">
<parentCategory ref="googlechrome" />
<supportedOn ref="SUPPORTED_WINXPSP2" />
diff --git a/chrome/app/policy/windows/admx/en-US/chrome.adml b/chrome/app/policy/windows/admx/en-US/chrome.adml index b082aec..0986ba0 100644 --- a/chrome/app/policy/windows/admx/en-US/chrome.adml +++ b/chrome/app/policy/windows/admx/en-US/chrome.adml @@ -100,6 +100,12 @@ If you enable this setting, users can have Google Chrome memorize passwords and If you disable this setting, users are not able to save passwords or use already saved passwords.
If you enable or disable this setting, users cannot change or override this setting in Google Chrome.</string>
+ <string id="AutoFillEnabled">Enable AutoFill</string>
+ <string id="AutoFillEnabled_Explain">Enables the AutoFill feature.
+
+If you disable this setting, the AutoFill feature will not be available to users.
+
+If you enable or do not configure this setting, users can turn on and configure AutoFill.</string>
<string id="DisabledPlugins">Specify a list of plugins that are disabled</string>
<string id="DisabledPlugins_Explain">Specifies a list of plugins that are disabled in Google Chrome and prevents users from changing this setting. The value is a comma-separated list of the names of plugins to be disabled.
@@ -136,6 +142,7 @@ If you disable this setting, the button will be hidden.</string> <presentation id="SafeBrowsingEnabled" />
<presentation id="MetricsReportingEnabled" />
<presentation id="PasswordManagerEnabled" />
+ <presentation id="AutoFillEnabled" />
<presentation id="DisabledPlugins">
<textBox refId="DisabledPluginsList">
<label>Comma-separated list of disabled plugins:</label>
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.h b/chrome/browser/autofill/autofill_dialog_controller_mac.h index 3b17c24..d311084 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac.h +++ b/chrome/browser/autofill/autofill_dialog_controller_mac.h @@ -15,9 +15,11 @@ #include "chrome/browser/autofill/autofill_dialog.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" +#include "chrome/browser/pref_member.h" namespace AutoFillDialogControllerInternal { class PersonalDataManagerObserver; +class PrefObserver; } // AutoFillDialogControllerInternal @class AutoFillAddressSheetController; @@ -26,7 +28,7 @@ class PersonalDataManagerObserver; class Profile; @class WindowSizeAutosaver; -// A window controller for managing the autofill options dialog. +// A window controller for managing the AutoFill options dialog. // Application modally presents a dialog allowing the user to store // personal address and credit card information. @interface AutoFillDialogController : NSWindowController <NSTableViewDelegate> { @@ -62,9 +64,18 @@ class Profile; // Working list of input credit cards. std::vector<CreditCard> creditCards_; + // Tracks the AutoFill enabled preference. + BooleanPrefMember prefAutoFillEnabled_; + // State of checkbox for enabling AutoFill in general. BOOL autoFillEnabled_; + // Whether AutoFill is controlled by configuration management. + BOOL autoFillManaged_; + + // Whether AutoFill is managed and disabled. + BOOL autoFillManagedAndDisabled_; + // State of checkbox for enabling Mac Address Book integration. BOOL auxiliaryEnabled_; @@ -90,6 +101,9 @@ class Profile; // Manages PersonalDataManager loading. scoped_ptr<AutoFillDialogControllerInternal::PersonalDataManagerObserver> personalDataManagerObserver_; + + // Watches for changes to the AutoFill enabled preference. + scoped_ptr<AutoFillDialogControllerInternal::PrefObserver> prefObserver_; } // Property representing state of the AutoFill enabled preference. Checkbox is @@ -97,6 +111,15 @@ class Profile; // to this property. @property (nonatomic) BOOL autoFillEnabled; +// Property indicating whether AutoFill is under control of configuration +// management. The enabled state of the AutoFill enabled checkbox is bound to +// this property. +@property (nonatomic) BOOL autoFillManaged; + +// Property that is true iff AutoFill is managed and disabled. The save button's +// enabled state is bound to this property. +@property (nonatomic) BOOL autoFillManagedAndDisabled; + // Property representing state of Address Book "me" card usage. Checkbox is // bound to this in nib. @property (nonatomic) BOOL auxiliaryEnabled; diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm index fe28c53..44405c0 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm @@ -18,6 +18,8 @@ #import "chrome/browser/cocoa/window_size_autosaver.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_observer.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/app_resources.h" @@ -85,6 +87,10 @@ void UpdateProfileLabels(std::vector<AutoFillProfile>* input) { - (void)onPersonalDataLoaded:(const std::vector<AutoFillProfile*>&)profiles creditCards:(const std::vector<CreditCard*>&)creditCards; +// Called upon changes to AutoFill preferences that should be reflected in the +// UI. +- (void)onPrefChanged:(const std::string&)prefName; + // Returns true if |row| is an index to a valid profile in |tableView_|, and // false otherwise. - (BOOL)isProfileRow:(NSInteger)row; @@ -184,11 +190,37 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() { creditCards:personal_data_manager_->credit_cards()]; } +// Bridges preference changed notifications to the dialog controller. +class PrefObserver : public NotificationObserver { + public: + explicit PrefObserver(AutoFillDialogController* controller) + : controller_(controller) {} + + // Overridden from NotificationObserver: + virtual void Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details) { + if (type == NotificationType::PREF_CHANGED) { + const std::string* pref = Details<std::string>(details).ptr(); + if (pref) { + [controller_ onPrefChanged:*pref]; + } + } + } + + private: + AutoFillDialogController* controller_; + + DISALLOW_COPY_AND_ASSIGN(PrefObserver); +}; + } // namespace AutoFillDialogControllerInternal @implementation AutoFillDialogController @synthesize autoFillEnabled = autoFillEnabled_; +@synthesize autoFillManaged = autoFillManaged_; +@synthesize autoFillManagedAndDisabled = autoFillManagedAndDisabled_; @synthesize auxiliaryEnabled = auxiliaryEnabled_; @synthesize itemIsSelected = itemIsSelected_; @synthesize multipleSelected = multipleSelected_; @@ -245,9 +277,10 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() { // Called when the user clicks the save button. - (IBAction)save:(id)sender { - // If we have an |observer_| then communicate the changes back. - if (observer_) { - profile_->GetPrefs()->SetBoolean(prefs::kAutoFillEnabled, autoFillEnabled_); + // If we have an |observer_| then communicate the changes back, unless + // AutoFill has been disabled through policy in the mean time. + if (observer_ && !autoFillManagedAndDisabled_) { + prefAutoFillEnabled_.SetValueIfNotManaged(autoFillEnabled_); profile_->GetPrefs()->SetBoolean(prefs::kAutoFillAuxiliaryProfilesEnabled, auxiliaryEnabled_); observer_->OnAutoFillDialogApply(&profiles_, &creditCards_); @@ -631,7 +664,7 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() { // This is the designated initializer for this class. -// |profiles| are non-retained immutable list of autofill profiles. +// |profiles| are non-retained immutable list of AutoFill profiles. // |creditCards| are non-retained immutable list of credit card info. - (id)initWithObserver:(AutoFillDialogObserver*)observer profile:(Profile*)profile @@ -650,9 +683,15 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() { importedProfile_ = importedProfile; importedCreditCard_ = importedCreditCard; - // Use property here to trigger KVO binding. - [self setAutoFillEnabled:profile_->GetPrefs()->GetBoolean( - prefs::kAutoFillEnabled)]; + // Initialize the preference observer and watch kAutoFillEnabled. + prefObserver_.reset( + new AutoFillDialogControllerInternal::PrefObserver(self)); + prefAutoFillEnabled_.Init(prefs::kAutoFillEnabled, profile_->GetPrefs(), + prefObserver_.get()); + + // Call onPrefChanged in order to initialize UI state of the checkbox and + // save button. + [self onPrefChanged:prefs::kAutoFillEnabled]; // Use property here to trigger KVO binding. [self setAuxiliaryEnabled:profile_->GetPrefs()->GetBoolean( @@ -750,6 +789,17 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() { UpdateProfileLabels(&profiles_); } +- (void)onPrefChanged:(const std::string&)prefName { + if (prefName == prefs::kAutoFillEnabled) { + [self setAutoFillEnabled:prefAutoFillEnabled_.GetValue()]; + [self setAutoFillManaged:prefAutoFillEnabled_.IsManaged()]; + [self setAutoFillManagedAndDisabled: + prefAutoFillEnabled_.IsManaged() && !prefAutoFillEnabled_.GetValue()]; + } else { + NOTREACHED(); + } +} + - (BOOL)isProfileRow:(NSInteger)row { if (row > 0 && static_cast<size_t>(row) <= profiles_.size()) return YES; diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm index 4509e68..6263102 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm @@ -4,6 +4,7 @@ #include "base/ref_counted.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #import "chrome/browser/autofill/autofill_address_model_mac.h" #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h" #import "chrome/browser/autofill/autofill_credit_card_model_mac.h" @@ -16,6 +17,7 @@ #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" +#include "chrome/test/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -767,4 +769,67 @@ TEST_F(AutoFillDialogControllerTest, AutoFillEnabledChanged) { prefs::kAutoFillEnabled)); } +TEST_F(AutoFillDialogControllerTest, PolicyRefresh) { + LoadDialog(); + ASSERT_FALSE([controller_ autoFillManaged]); + + // Disable AutoFill through configuration policy. + helper_.profile()->GetTestingPrefService()->SetManagedPref( + prefs::kAutoFillEnabled, Value::CreateBooleanValue(false)); + ASSERT_TRUE([controller_ autoFillManaged]); + ASSERT_FALSE([controller_ autoFillEnabled]); + + // Enabling through policy should switch to enabled but not editable. + helper_.profile()->GetTestingPrefService()->SetManagedPref( + prefs::kAutoFillEnabled, Value::CreateBooleanValue(true)); + ASSERT_TRUE([controller_ autoFillManaged]); + ASSERT_TRUE([controller_ autoFillEnabled]); + + [controller_ cancel:nil]; +} + +TEST_F(AutoFillDialogControllerTest, PolicyDisabledAndSave) { + // Disable AutoFill through configuration policy. + helper_.profile()->GetTestingPrefService()->SetManagedPref( + prefs::kAutoFillEnabled, Value::CreateBooleanValue(false)); + helper_.profile()->GetPrefs()->SetBoolean( + prefs::kAutoFillAuxiliaryProfilesEnabled, false); + LoadDialog(); + + // Save should be disabled. + ASSERT_TRUE([controller_ autoFillManagedAndDisabled]); + + [controller_ setAuxiliaryEnabled:YES]; + [controller_ save:nil]; + + // Observer should not have been called. + ASSERT_FALSE(observer_.hit_); + + // Auxiliary profiles setting should be unchanged. + ASSERT_FALSE(helper_.profile()->GetPrefs()->GetBoolean( + prefs::kAutoFillAuxiliaryProfilesEnabled)); +} + +TEST_F(AutoFillDialogControllerTest, PolicyEnabledAndSave) { + // Enable AutoFill through configuration policy. + helper_.profile()->GetTestingPrefService()->SetManagedPref( + prefs::kAutoFillEnabled, Value::CreateBooleanValue(true)); + helper_.profile()->GetPrefs()->SetBoolean( + prefs::kAutoFillAuxiliaryProfilesEnabled, false); + LoadDialog(); + + // Save should be enabled. + ASSERT_FALSE([controller_ autoFillManagedAndDisabled]); + + [controller_ setAuxiliaryEnabled:YES]; + [controller_ save:nil]; + + // Observer should have been notified. + ASSERT_TRUE(observer_.hit_); + + // Auxiliary profiles setting should have been saved. + ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean( + prefs::kAutoFillAuxiliaryProfilesEnabled)); +} + } // namespace diff --git a/chrome/browser/autofill/autofill_dialog_gtk.cc b/chrome/browser/autofill/autofill_dialog_gtk.cc index cc383d8..624f36b 100644 --- a/chrome/browser/autofill/autofill_dialog_gtk.cc +++ b/chrome/browser/autofill/autofill_dialog_gtk.cc @@ -273,7 +273,7 @@ void AutoFillDialog::OnAutoFillCheckToggled(GtkWidget* widget) { UserMetrics::RecordAction(UserMetricsAction("Options_FormAutofill_Disable"), profile_); } - enable_form_autofill_.SetValue(enabled); + enable_form_autofill_.SetValueIfNotManaged(enabled); profile_->GetPrefs()->ScheduleSavePersistentPrefs(); UpdateWidgetState(); } @@ -546,6 +546,8 @@ void AutoFillDialog::InitializeWidgets() { } void AutoFillDialog::UpdateWidgetState() { + gtk_widget_set_sensitive(form_autofill_enable_check_, + !enable_form_autofill_.IsManaged()); if (!personal_data_->IsDataLoaded() || !enable_form_autofill_.GetValue()) { gtk_widget_set_sensitive(add_address_button_, FALSE); gtk_widget_set_sensitive(add_credit_card_button_, FALSE); diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h index 239afe0..3cc9a39 100644 --- a/chrome/browser/cocoa/preferences_window_controller.h +++ b/chrome/browser/cocoa/preferences_window_controller.h @@ -94,6 +94,7 @@ class ProfileSyncService; // User Data panel BooleanPrefMember askSavePasswords_; + BooleanPrefMember autoFillEnabled_; IBOutlet NSButton* autoFillSettingsButton_; IBOutlet NSButton* syncButton_; IBOutlet NSButton* syncCustomizeButton_; @@ -103,6 +104,7 @@ class ProfileSyncService; scoped_nsobject<NSColor> syncStatusNoErrorBackgroundColor_; scoped_nsobject<NSColor> syncLinkNoErrorBackgroundColor_; scoped_nsobject<NSColor> syncErrorBackgroundColor_; + BOOL autoFillSettingsButtonEnabled_; // Under the hood panel IBOutlet NSView* underTheHoodContentView_; @@ -174,8 +176,9 @@ class ProfileSyncService; // Usable from cocoa bindings to hook up the custom home pages table. @property (nonatomic, readonly) CustomHomePagesModel* customPagesSource; -@property (assign, nonatomic) BOOL proxiesConfigureButtonEnabled; @property (assign, nonatomic) BOOL showHomeButtonEnabled; +@property (assign, nonatomic) BOOL autoFillSettingsButtonEnabled; +@property (assign, nonatomic) BOOL proxiesConfigureButtonEnabled; @end @@ -204,4 +207,3 @@ class ProfileSyncService; - (NSView*)getPrefsViewForPage:(OptionsPage)page; @end - diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 30d8baf..777f1d0 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -419,6 +419,7 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { @implementation PreferencesWindowController @synthesize showHomeButtonEnabled = showHomeButtonEnabled_; +@synthesize autoFillSettingsButtonEnabled = autoFillSettingsButtonEnabled_; @synthesize proxiesConfigureButtonEnabled = proxiesConfigureButtonEnabled_; - (id)initWithProfile:(Profile*)profile initialPage:(OptionsPage)initialPage { @@ -488,6 +489,9 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { PersonalDataManager* personalDataManager = profile_->GetPersonalDataManager(); [autoFillSettingsButton_ setHidden:(personalDataManager == NULL)]; + bool autofill_disabled_by_policy = + autoFillEnabled_.IsManaged() && !autoFillEnabled_.GetValue(); + [self setAutoFillSettingsButtonEnabled:!autofill_disabled_by_policy]; // Initialize the proxy pref set observer. proxyPrefs_.reset( @@ -757,6 +761,7 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { // Personal Stuff panel askSavePasswords_.Init(prefs::kPasswordManagerEnabled, prefs_, observer_.get()); + autoFillEnabled_.Init(prefs::kAutoFillEnabled, prefs_, observer_.get()); currentTheme_.Init(prefs::kCurrentThemeID, prefs_, observer_.get()); // Under the hood panel @@ -1212,6 +1217,11 @@ const int kDisabledIndex = 1; [self setPasswordManagerEnabledIndex:askSavePasswords_.GetValue() ? kEnabledIndex : kDisabledIndex]; } + if (*prefName == prefs::kAutoFillEnabled) { + bool autofill_disabled_by_policy = + autoFillEnabled_.IsManaged() && !autoFillEnabled_.GetValue(); + [self setAutoFillSettingsButtonEnabled:!autofill_disabled_by_policy]; + } if (*prefName == prefs::kCurrentThemeID) { [self setIsUsingDefaultTheme:currentTheme_.GetValue().length() == 0]; } diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index a9e9514..afe737e 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -101,6 +101,8 @@ ContentPageGtk::ContentPageGtk(Profile* profile) // Add preferences observers. ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled, profile->GetPrefs(), this); + form_autofill_enabled_.Init(prefs::kAutoFillEnabled, + profile->GetPrefs(), this); if (browser_defaults::kCanToggleSystemTitleBar) { use_custom_chrome_frame_.Init(prefs::kUseCustomChromeFrame, profile->GetPrefs(), this); @@ -161,6 +163,11 @@ void ContentPageGtk::NotifyPrefChanged(const std::string* pref_name) { GTK_TOGGLE_BUTTON(passwords_neversave_radio_), TRUE); } } + if (!pref_name || *pref_name == prefs::kAutoFillEnabled) { + bool disabled_by_policy = form_autofill_enabled_.IsManaged() && + !form_autofill_enabled_.GetValue(); + gtk_widget_set_sensitive(autofill_button_, !disabled_by_policy); + } if (browser_defaults::kCanToggleSystemTitleBar && (!pref_name || *pref_name == prefs::kUseCustomChromeFrame)) { if (use_custom_chrome_frame_.GetValue()) { @@ -247,12 +254,12 @@ GtkWidget* ContentPageGtk::InitFormAutoFillGroup() { gtk_container_add(GTK_CONTAINER(vbox), button_hbox); // AutoFill button. - GtkWidget* autofill_button = gtk_button_new_with_label( + autofill_button_ = gtk_button_new_with_label( l10n_util::GetStringUTF8(IDS_AUTOFILL_OPTIONS).c_str()); - g_signal_connect(G_OBJECT(autofill_button), "clicked", + g_signal_connect(G_OBJECT(autofill_button_), "clicked", G_CALLBACK(OnAutoFillButtonClickedThunk), this); - gtk_box_pack_start(GTK_BOX(button_hbox), autofill_button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(button_hbox), autofill_button_, FALSE, FALSE, 0); return vbox; } diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h index f41cf99..6c505b7 100644 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ b/chrome/browser/gtk/options/content_page_gtk.h @@ -69,6 +69,9 @@ class ContentPageGtk : public OptionsPageBase, GtkWidget* passwords_asktosave_radio_; GtkWidget* passwords_neversave_radio_; + // Widgets for the AutoFill group. + GtkWidget* autofill_button_; + // Widgets for the Appearance group. GtkWidget* system_title_bar_show_radio_; GtkWidget* system_title_bar_hide_radio_; @@ -91,6 +94,7 @@ class ContentPageGtk : public OptionsPageBase, // Pref members. BooleanPrefMember ask_to_save_passwords_; + BooleanPrefMember form_autofill_enabled_; BooleanPrefMember use_custom_chrome_frame_; // Flag to ignore gtk callbacks while we are loading prefs, to avoid diff --git a/chrome/browser/managed_prefs_banner_base.cc b/chrome/browser/managed_prefs_banner_base.cc index 33b7e83..f97fb59 100644 --- a/chrome/browser/managed_prefs_banner_base.cc +++ b/chrome/browser/managed_prefs_banner_base.cc @@ -55,6 +55,7 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state, break; case OPTIONS_PAGE_CONTENT: AddUserPref(prefs::kSyncManaged); + AddUserPref(prefs::kAutoFillEnabled); AddUserPref(prefs::kPasswordManagerEnabled); break; case OPTIONS_PAGE_ADVANCED: diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 9b6eb11..b702ca8 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -373,6 +373,18 @@ bool ConfigurationPolicyPrefStore::ApplySyncPolicy(PolicyType policy, return false; } +bool ConfigurationPolicyPrefStore::ApplyAutoFillPolicy(PolicyType policy, + Value* value) { + if (policy == ConfigurationPolicyStore::kPolicyAutoFillEnabled) { + bool auto_fill_enabled; + if (value->GetAsBoolean(&auto_fill_enabled) && !auto_fill_enabled) + prefs_->Set(prefs::kAutoFillEnabled, Value::CreateBooleanValue(false)); + delete value; + return true; + } + return false; +} + bool ConfigurationPolicyPrefStore::ApplyPolicyFromMap(PolicyType policy, Value* value, const PolicyToPreferenceMapEntry map[], int size) { const PolicyToPreferenceMapEntry* end = map + size; @@ -397,6 +409,9 @@ void ConfigurationPolicyPrefStore::Apply(PolicyType policy, Value* value) { if (ApplySyncPolicy(policy, value)) return; + if (ApplyAutoFillPolicy(policy, value)) + return; + if (ApplyPolicyFromMap(policy, value, simple_policy_map_, arraysize(simple_policy_map_))) return; diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h index 6828ba8..fb177de 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.h +++ b/chrome/browser/policy/configuration_policy_pref_store.h @@ -99,6 +99,10 @@ class ConfigurationPolicyPrefStore : public PrefStore, // Assumes ownership of |value| in that case. bool ApplySyncPolicy(PolicyType policy, Value* value); + // Handles policies that affect AutoFill. Returns true if the policy was + // handled and assumes ownership of |value| in that case. + bool ApplyAutoFillPolicy(PolicyType policy, Value* value); + DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefStore); }; diff --git a/chrome/browser/policy/configuration_policy_provider.cc b/chrome/browser/policy/configuration_policy_provider.cc index 54aedaa..d24196b 100644 --- a/chrome/browser/policy/configuration_policy_provider.cc +++ b/chrome/browser/policy/configuration_policy_provider.cc @@ -44,6 +44,8 @@ const InternalPolicyValueMapEntry kPolicyValueMap[] = { Value::TYPE_BOOLEAN, policy::key::kMetricsReportingEnabled }, { ConfigurationPolicyStore::kPolicyPasswordManagerEnabled, Value::TYPE_BOOLEAN, policy::key::kPasswordManagerEnabled }, + { ConfigurationPolicyStore::kPolicyAutoFillEnabled, + Value::TYPE_BOOLEAN, policy::key::kAutoFillEnabled }, { ConfigurationPolicyStore::kPolicyDisabledPlugins, Value::TYPE_STRING, policy::key::kDisabledPluginsList }, { ConfigurationPolicyStore::kPolicyApplicationLocale, diff --git a/chrome/browser/policy/configuration_policy_store.h b/chrome/browser/policy/configuration_policy_store.h index 66bf006..e74fe6c 100644 --- a/chrome/browser/policy/configuration_policy_store.h +++ b/chrome/browser/policy/configuration_policy_store.h @@ -30,6 +30,7 @@ class ConfigurationPolicyStore { kPolicySafeBrowsingEnabled, kPolicyMetricsReportingEnabled, kPolicyPasswordManagerEnabled, + kPolicyAutoFillEnabled, kPolicySyncDisabled, kPolicyApplicationLocale, kPolicyExtensionInstallAllowList, diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc index 56708f0..5417728 100644 --- a/chrome/browser/views/autofill_profiles_view_win.cc +++ b/chrome/browser/views/autofill_profiles_view_win.cc @@ -24,6 +24,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/views/list_background.h" #include "chrome/browser/window_sizer.h" +#include "chrome/common/notification_details.h" #include "chrome/common/pref_names.h" #include "gfx/canvas.h" #include "gfx/native_theme_win.h" @@ -84,6 +85,7 @@ AutoFillProfilesView::AutoFillProfilesView( billing_model_(true), child_dialog_opened_(false) { DCHECK(preferences_); + enable_auto_fill_.Init(prefs::kAutoFillEnabled, preferences_, this); if (imported_profile) { profiles_set_.push_back(EditableSetInfo(imported_profile)); } @@ -152,7 +154,6 @@ void AutoFillProfilesView::AddClicked(int group_type) { } void AutoFillProfilesView::EditClicked() { - DCHECK(scroll_view_); int index = scroll_view_->FirstSelectedRow(); if (index == -1) return; // Happens if user double clicks and the table is empty. @@ -173,8 +174,6 @@ void AutoFillProfilesView::EditClicked() { } void AutoFillProfilesView::DeleteClicked() { - DCHECK(scroll_view_); - DCHECK(table_model_.get()); DCHECK_GT(scroll_view_->SelectedRowCount(), 0); int last_view_row = -1; for (views::TableView::iterator i = scroll_view_->SelectionBegin(); @@ -187,17 +186,13 @@ void AutoFillProfilesView::DeleteClicked() { if (last_view_row >= 0) scroll_view_->Select(scroll_view_->ViewToModel(last_view_row)); UpdateBillingModel(); - UpdateButtonState(); + UpdateWidgetState(); } -void AutoFillProfilesView::UpdateButtonState() { - DCHECK(personal_data_manager_); - DCHECK(scroll_view_); - DCHECK(add_address_button_); - DCHECK(add_credit_card_button_); - DCHECK(edit_button_); - DCHECK(remove_button_); - bool autofill_enabled = preferences_->GetBoolean(prefs::kAutoFillEnabled); +void AutoFillProfilesView::UpdateWidgetState() { + bool autofill_enabled = enable_auto_fill_.GetValue(); + enable_auto_fill_button_->SetChecked(autofill_enabled); + enable_auto_fill_button_->SetEnabled(!enable_auto_fill_.IsManaged()); scroll_view_->SetEnabled(autofill_enabled); add_address_button_->SetEnabled(personal_data_manager_->IsDataLoaded() && !child_dialog_opened_ && autofill_enabled); @@ -227,12 +222,12 @@ void AutoFillProfilesView::UpdateBillingModel() { void AutoFillProfilesView::ChildWindowOpened() { child_dialog_opened_ = true; - UpdateButtonState(); + UpdateWidgetState(); } void AutoFillProfilesView::ChildWindowClosed() { child_dialog_opened_ = false; - UpdateButtonState(); + UpdateWidgetState(); } SkBitmap* AutoFillProfilesView::GetWarningBitmap(bool good) { @@ -318,7 +313,6 @@ std::wstring AutoFillProfilesView::GetWindowTitle() const { } void AutoFillProfilesView::WindowClosing() { - DCHECK(focus_manager_); focus_manager_->RemoveFocusChangeListener(this); instance_ = NULL; } @@ -333,7 +327,6 @@ bool AutoFillProfilesView::Cancel() { } bool AutoFillProfilesView::Accept() { - DCHECK(observer_); std::vector<AutoFillProfile> profiles; profiles.reserve(profiles_set_.size()); std::vector<EditableSetInfo>::iterator it; @@ -345,7 +338,6 @@ bool AutoFillProfilesView::Accept() { for (it = credit_card_set_.begin(); it != credit_card_set_.end(); ++it) { credit_cards.push_back(it->credit_card); } - DCHECK(preferences_); observer_->OnAutoFillDialogApply(&profiles, &credit_cards); return true; } @@ -367,9 +359,9 @@ void AutoFillProfilesView::ButtonPressed(views::Button* sender, UserMetricsAction action(enabled ? "Options_FormAutofill_Enable" : "Options_FormAutofill_Disable"); UserMetrics::RecordAction(action, profile_); - preferences_->SetBoolean(prefs::kAutoFillEnabled, enabled); + enable_auto_fill_.SetValueIfNotManaged(enabled); preferences_->ScheduleSavePersistentPrefs(); - UpdateButtonState(); + UpdateWidgetState(); } } @@ -395,7 +387,7 @@ void AutoFillProfilesView::FocusWillChange(views::View* focused_before, ///////////////////////////////////////////////////////////////////////////// // AutoFillProfilesView, views::TableViewObserver implementations: void AutoFillProfilesView::OnSelectionChanged() { - UpdateButtonState(); + UpdateWidgetState(); } void AutoFillProfilesView::OnDoubleClick() { @@ -412,6 +404,17 @@ void AutoFillProfilesView::OnPersonalDataLoaded() { } ///////////////////////////////////////////////////////////////////////////// +// AutoFillProfilesView, NotificationObserver implementation. +void AutoFillProfilesView::Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details) { + DCHECK_EQ(NotificationType::PREF_CHANGED, type.value); + const std::string* pref_name = Details<std::string>(details).ptr(); + if (!pref_name || *pref_name == prefs::kAutoFillEnabled) + UpdateWidgetState(); +} + +///////////////////////////////////////////////////////////////////////////// // AutoFillProfilesView, private: void AutoFillProfilesView::Init() { GetData(); @@ -419,8 +422,6 @@ void AutoFillProfilesView::Init() { enable_auto_fill_button_ = new views::Checkbox( l10n_util::GetString(IDS_OPTIONS_AUTOFILL_ENABLE)); enable_auto_fill_button_->set_listener(this); - enable_auto_fill_button_->SetChecked( - preferences_->GetBoolean(prefs::kAutoFillEnabled)); billing_model_.SetAddressLabels(profiles_set_); @@ -482,10 +483,9 @@ void AutoFillProfilesView::Init() { focus_manager_ = GetFocusManager(); - DCHECK(focus_manager_); focus_manager_->AddFocusChangeListener(this); - UpdateButtonState(); + UpdateWidgetState(); } void AutoFillProfilesView::GetData() { @@ -520,7 +520,7 @@ void AutoFillProfilesView::GetData() { // Update state only if buttons already created. if (add_address_button_) { - UpdateButtonState(); + UpdateWidgetState(); } } diff --git a/chrome/browser/views/autofill_profiles_view_win.h b/chrome/browser/views/autofill_profiles_view_win.h index d11da9e..af8c317 100644 --- a/chrome/browser/views/autofill_profiles_view_win.h +++ b/chrome/browser/views/autofill_profiles_view_win.h @@ -15,6 +15,8 @@ #include "chrome/browser/autofill/autofill_dialog.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/personal_data_manager.h" +#include "chrome/browser/pref_member.h" +#include "chrome/common/notification_observer.h" #include "views/controls/combobox/combobox.h" #include "views/controls/link.h" #include "views/controls/table/table_view_observer.h" @@ -56,7 +58,8 @@ class AutoFillProfilesView : public views::View, public views::LinkController, public views::FocusChangeListener, public views::TableViewObserver, - public PersonalDataManager::Observer { + public PersonalDataManager::Observer, + public NotificationObserver { public: virtual ~AutoFillProfilesView(); @@ -81,7 +84,7 @@ class AutoFillProfilesView : public views::View, void DeleteClicked(); // Updates state of the buttons. - void UpdateButtonState(); + void UpdateWidgetState(); // Updates inferred labels. void UpdateProfileLabels(); @@ -141,6 +144,11 @@ class AutoFillProfilesView : public views::View, // PersonalDataManager::Observer methods: virtual void OnPersonalDataLoaded(); + // NotificationObserver methods: + virtual void Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details); + // Helper structure to keep info on one address or credit card. // Keeps info on one item in EditableSetViewContents. // Also keeps info on opened status. Allows to quickly add and delete items, @@ -453,6 +461,8 @@ class AutoFillProfilesView : public views::View, AddressComboBoxModel billing_model_; + BooleanPrefMember enable_auto_fill_; + views::Checkbox* enable_auto_fill_button_; views::Button* add_address_button_; views::Button* add_credit_card_button_; diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 6775232..d49c024 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -218,6 +218,8 @@ void ContentPageView::InitControlLayout() { // Init member prefs so we can update the controls if prefs change. ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled, profile()->GetPrefs(), this); + form_autofill_enabled_.Init(prefs::kAutoFillEnabled, + profile()->GetPrefs(), this); is_using_default_theme_.Init(prefs::kCurrentThemeID, profile()->GetPrefs(), this); @@ -236,6 +238,12 @@ void ContentPageView::NotifyPrefChanged(const std::string* pref_name) { passwords_neversave_radio_->SetChecked(true); } } + if (!pref_name || *pref_name == prefs::kAutoFillEnabled) { + bool disabled_by_policy = form_autofill_enabled_.IsManaged() && + !form_autofill_enabled_.GetValue(); + change_autofill_settings_button_->SetEnabled( + !disabled_by_policy && profile()->GetPersonalDataManager()); + } if (!pref_name || *pref_name == prefs::kCurrentThemeID) { themes_reset_button_->SetEnabled( is_using_default_theme_.GetValue().length() > 0); @@ -311,9 +319,6 @@ void ContentPageView::InitPasswordSavingGroup() { void ContentPageView::InitFormAutofillGroup() { change_autofill_settings_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_AUTOFILL_OPTIONS)); - if (!profile()->GetPersonalDataManager()) - change_autofill_settings_button_->SetEnabled(false); - using views::GridLayout; using views::ColumnSet; diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h index 06f0a3f..33644d3 100644 --- a/chrome/browser/views/options/content_page_view.h +++ b/chrome/browser/views/options/content_page_view.h @@ -104,6 +104,7 @@ class ContentPageView : public OptionsPageView, views::Link* privacy_dashboard_link_; BooleanPrefMember ask_to_save_passwords_; + BooleanPrefMember form_autofill_enabled_; StringPrefMember is_using_default_theme_; // Cached pointer to ProfileSyncService, if it exists. Kept up to date diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc index 1668d5f..65bd48c 100644 --- a/chrome/common/policy_constants.cc +++ b/chrome/common/policy_constants.cc @@ -28,6 +28,7 @@ const char kDnsPrefetchingEnabled[] = "DnsPrefetchingEnabled"; const char kSafeBrowsingEnabled[] = "SafeBrowsingEnabled"; const char kMetricsReportingEnabled[] = "MetricsReportingEnabled"; const char kPasswordManagerEnabled[] = "PasswordManagerEnabled"; +const char kAutoFillEnabled[] = "AutoFillEnabled"; const char kDisabledPluginsList[] = "DisabledPluginsList"; const char kApplicationLocaleValue[] = "ApplicationLocaleValue"; const char kSyncDisabled[] = "SyncDisabled"; diff --git a/chrome/common/policy_constants.h b/chrome/common/policy_constants.h index df533d5..b00dac2 100644 --- a/chrome/common/policy_constants.h +++ b/chrome/common/policy_constants.h @@ -30,6 +30,7 @@ extern const char kDnsPrefetchingEnabled[]; extern const char kSafeBrowsingEnabled[]; extern const char kMetricsReportingEnabled[]; extern const char kPasswordManagerEnabled[]; +extern const char kAutoFillEnabled[]; extern const char kDisabledPluginsList[]; extern const char kApplicationLocaleValue[]; extern const char kSyncDisabled[]; |