diff options
author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 10:04:26 +0000 |
---|---|---|
committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 10:04:26 +0000 |
commit | d0f4b0e5b86ef0ef181d0b23257f321ae2e9fc51 (patch) | |
tree | c938c616680c776d8f3bd854d7970a49b37f3baa /chrome/app/nibs | |
parent | ead270f14e86fbdae7e4f4151ad4838c5c738dec (diff) | |
download | chromium_src-d0f4b0e5b86ef0ef181d0b23257f321ae2e9fc51.zip chromium_src-d0f4b0e5b86ef0ef181d0b23257f321ae2e9fc51.tar.gz chromium_src-d0f4b0e5b86ef0ef181d0b23257f321ae2e9fc51.tar.bz2 |
Implements policies to enable or disable the five Privacy checkboxes found in the Options dialog, in the Under the Hood section.
xib changes: added an enabled binding to the policy-controlled checkboxes in the "Under the Hood" preference pane so that they can be disabled when their value is overridden by policy. The methods for the bindings are in the preference window controller.
BUG=44394
TEST=ConfigurationPolicyPrefStoreTest.* and ConfigurationPolicyProviderWinTest.* Manual tests: Set the policies externally. Check that the checkbox in Options/Under the Hood/Privacy/search suggest... are disabled. Also check that the check box is set/unset as done by the policy.
Review URL: http://codereview.chromium.org/2746006
Patch from Jean-Luc Brouillet <jeanluc@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r-- | chrome/app/nibs/Preferences.xib | 96 |
1 files changed, 88 insertions, 8 deletions
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index 0f52326..4cb9464 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -8,11 +8,11 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="595"/> - <integer value="481"/> <integer value="3"/> <integer value="74"/> <integer value="482"/> + <integer value="595"/> + <integer value="481"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -846,7 +846,7 @@ AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -3854,6 +3854,86 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">681</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: isSuggestEnabled</string> + <reference key="source" ref="808321623"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="808321623"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: isSuggestEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">isSuggestEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">683</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: isAlternateErrorPagesEnabled</string> + <reference key="source" ref="480577047"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="480577047"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: isAlternateErrorPagesEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">isAlternateErrorPagesEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">685</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: isDnsPrefetchEnabled</string> + <reference key="source" ref="139965100"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="139965100"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: isDnsPrefetchEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">isDnsPrefetchEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">687</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: isSafeBrowsingEnabled</string> + <reference key="source" ref="217654608"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="217654608"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: isSafeBrowsingEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">isSafeBrowsingEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">689</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: isMetricsRecordingEnabled</string> + <reference key="source" ref="346222444"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="346222444"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: isMetricsRecordingEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">isMetricsRecordingEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">691</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -5418,14 +5498,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{555, 302}, {540, 468}}</string> + <string>{{278, 302}, {540, 468}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> </object> - <string>{{555, 448}, {540, 408}}</string> + <string>{{278, 448}, {540, 408}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{687, 393}, {540, 463}}</string> + <string>{{278, 393}, {540, 463}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{682, 562}, {616, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5505,7 +5585,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{652, 102}, {443, 754}}</string> + <string>{{375, 102}, {443, 754}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5545,7 +5625,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">681</int> + <int key="maxID">691</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> |