diff options
author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 15:38:18 +0000 |
---|---|---|
committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 15:38:18 +0000 |
commit | 8ee529ffc5db8bb1a040f02f5878b591f5e48ef2 (patch) | |
tree | 9849f28d6fe0c1268447c9a130a573da994231e7 /chrome/app/nibs | |
parent | 9ceda77323dcc335680d3cb47b0b76e2821199ad (diff) | |
download | chromium_src-8ee529ffc5db8bb1a040f02f5878b591f5e48ef2.zip chromium_src-8ee529ffc5db8bb1a040f02f5878b591f5e48ef2.tar.gz chromium_src-8ee529ffc5db8bb1a040f02f5878b591f5e48ef2.tar.bz2 |
[mac] Properly update prefs window UI if managed preferences change.
Preferences.xib changes: Rename various binding targets.
BUG=53830, 53834
TEST=Mac prefs get disabled properly when configuration policy is in effect.
Review URL: http://codereview.chromium.org/3274006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r-- | chrome/app/nibs/Preferences.xib | 221 |
1 files changed, 122 insertions, 99 deletions
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index b6a22de..0c8f14b 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -12,9 +12,9 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="482"/> <integer value="74"/> <integer value="79"/> + <integer value="482"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2843,22 +2843,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="connectionID">438</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: metricsRecording</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">value: metricsRecording</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">metricsRecording</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">440</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">themesGallery:</string> <reference key="source" ref="1001"/> @@ -3663,86 +3647,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <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 class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">managedPrefsBannerView_</string> <reference key="source" ref="1001"/> @@ -4014,6 +3918,118 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">758</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: showAlternateErrorPagesEnabled</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: showAlternateErrorPagesEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">showAlternateErrorPagesEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">759</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: useSuggestEnabled</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: useSuggestEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">useSuggestEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">760</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: dnsPrefetchEnabled</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: dnsPrefetchEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">dnsPrefetchEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">761</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: safeBrowsingEnabled</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: safeBrowsingEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">safeBrowsingEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">762</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: metricsReportingEnabled</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: metricsReportingEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">metricsReportingEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">763</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: metricsReporting</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">value: metricsReporting</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">metricsReporting</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">764</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: restoreURLsEnabled</string> + <reference key="source" ref="165250101"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="165250101"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: restoreURLsEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">restoreURLsEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">766</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -5757,7 +5773,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{388, 361}, {443, 849}}</string> + <string>{{389, 361}, {443, 849}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>HyperlinkButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5794,7 +5810,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">758</int> + <int key="maxID">766</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -6068,6 +6084,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/framed_browser_window.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/cocoa/themed_window.h</string> </object> </object> |