Index: chrome/app/nibs/ContentSettings.xib |
diff --git a/chrome/app/nibs/ContentSettings.xib b/chrome/app/nibs/ContentSettings.xib |
index e2e45b30f0d414068de8a05ce59a0c17561fb47d..72038f18a857f233de7b0c20b9da88dda93b9ebf 100644 |
--- a/chrome/app/nibs/ContentSettings.xib |
+++ b/chrome/app/nibs/ContentSettings.xib |
@@ -12,7 +12,7 @@ |
</object> |
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
- <integer value="182"/> |
+ <integer value="166"/> |
</object> |
<object class="NSArray" key="IBDocument.PluginDependencies"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -212,7 +212,7 @@ |
<object class="NSTabViewItem" id="537236264"> |
<string key="NSIdentifier">1</string> |
<object class="NSView" key="NSView" id="287887251"> |
- <reference key="NSNextResponder" ref="604468971"/> |
+ <nil key="NSNextResponder"/> |
<int key="NSvFlags">256</int> |
<object class="NSMutableArray" key="NSSubviews"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -552,7 +552,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> |
</object> |
</object> |
<string key="NSFrameSize">{537, 377}</string> |
- <reference key="NSSuperview" ref="604468971"/> |
</object> |
<string key="NSLabel">^IDS_COOKIES_TAB_LABEL</string> |
<reference key="NSColor" ref="542606114"/> |
@@ -1930,7 +1929,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> |
<object class="NSTabViewItem" id="646198478"> |
<string key="NSIdentifier">6</string> |
<object class="NSView" key="NSView" id="826885056"> |
- <nil key="NSNextResponder"/> |
+ <reference key="NSNextResponder" ref="604468971"/> |
<int key="NSvFlags">256</int> |
<object class="NSMutableArray" key="NSSubviews"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -2290,20 +2289,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> |
</object> |
</object> |
<string key="NSFrameSize">{537, 377}</string> |
+ <reference key="NSSuperview" ref="604468971"/> |
</object> |
<string key="NSLabel">^IDS_NOTIFICATIONS_TAB_LABEL</string> |
<reference key="NSColor" ref="542606114"/> |
<reference key="NSTabView" ref="604468971"/> |
</object> |
</object> |
- <reference key="NSSelectedTabViewItem" ref="537236264"/> |
+ <reference key="NSSelectedTabViewItem" ref="646198478"/> |
<reference key="NSFont" ref="793851927"/> |
<int key="NSTvFlags">6</int> |
<bool key="NSAllowTruncatedLabels">YES</bool> |
<bool key="NSDrawsBackground">YES</bool> |
<object class="NSMutableArray" key="NSSubviews"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
- <reference ref="287887251"/> |
+ <reference ref="826885056"/> |
</object> |
</object> |
</object> |
@@ -2872,6 +2872,46 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> |
</object> |
<int key="connectionID">265</int> |
</object> |
+ <object class="IBConnectionRecord"> |
+ <object class="IBBindingConnection" key="connection"> |
+ <string key="label">enabled: geolocationSettingsManaged</string> |
+ <reference key="source" ref="415204368"/> |
+ <reference key="destination" ref="1001"/> |
+ <object class="NSNibBindingConnector" key="connector"> |
+ <reference key="NSSource" ref="415204368"/> |
+ <reference key="NSDestination" ref="1001"/> |
+ <string key="NSLabel">enabled: geolocationSettingsManaged</string> |
+ <string key="NSBinding">enabled</string> |
+ <string key="NSKeyPath">geolocationSettingsManaged</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">271</int> |
+ </object> |
+ <object class="IBConnectionRecord"> |
+ <object class="IBBindingConnection" key="connection"> |
+ <string key="label">enabled: notificationsSettingsManaged</string> |
+ <reference key="source" ref="499527741"/> |
+ <reference key="destination" ref="1001"/> |
+ <object class="NSNibBindingConnector" key="connector"> |
+ <reference key="NSSource" ref="499527741"/> |
+ <reference key="NSDestination" ref="1001"/> |
+ <string key="NSLabel">enabled: notificationsSettingsManaged</string> |
+ <string key="NSBinding">enabled</string> |
+ <string key="NSKeyPath">notificationsSettingsManaged</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">274</int> |
+ </object> |
</object> |
<object class="IBMutableOrderedSet" key="objectRecords"> |
<object class="NSArray" key="orderedObjects"> |
@@ -3718,9 +3758,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
- <string>{{521, 761}, {675, 377}}</string> |
+ <string>{{46, 620}, {675, 377}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
- <string>{{521, 761}, {675, 377}}</string> |
+ <string>{{46, 620}, {675, 377}}</string> |
<boolean value="NO"/> |
<string>{196, 240}</string> |
<string>{{357, 418}, {480, 270}}</string> |
@@ -3832,7 +3872,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> |
</object> |
</object> |
<nil key="sourceID"/> |
- <int key="maxID">265</int> |
+ <int key="maxID">274</int> |
</object> |
<object class="IBClassDescriber" key="IBDocument.Classes"> |
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> |