Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Unified Diff: chrome/app/nibs/ContentExceptionsWindow.xib

Issue 2858032: Display content settings applying to the current otr session only. (Closed)
Patch Set: updates Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/cocoa/content_exceptions_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/ContentExceptionsWindow.xib
diff --git a/chrome/app/nibs/ContentExceptionsWindow.xib b/chrome/app/nibs/ContentExceptionsWindow.xib
index 9e2b30f688af0025d583fc4451a9b2ac4971656a..2fdf4f497ca18ae0620206c1b32a5c7354ab7fa7 100644
--- a/chrome/app/nibs/ContentExceptionsWindow.xib
+++ b/chrome/app/nibs/ContentExceptionsWindow.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
+ <integer value="10"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -75,14 +75,14 @@
<object class="_NSCornerView" key="NSCornerView" id="274818157">
<reference key="NSNextResponder" ref="832680793"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+ <string key="NSFrame">{{477, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="832680793"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="20203331">
<string key="NSIdentifier">pattern</string>
- <double key="NSWidth">3.120000e+02</double>
+ <double key="NSWidth">2.530000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -141,7 +141,7 @@
</object>
<object class="NSTableColumn" id="332085935">
<string key="NSIdentifier">action</string>
- <double key="NSWidth">1.730000e+02</double>
+ <double key="NSWidth">1.140000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -199,6 +199,47 @@
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="178750169"/>
</object>
+ <object class="NSTableColumn" id="972931040">
+ <string key="NSIdentifier">otr</string>
+ <double key="NSWidth">8.000000e+01</double>
+ <double key="NSMinWidth">4.000000e+01</double>
+ <double key="NSMaxWidth">1.000000e+03</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">^IDS_EXCEPTIONS_OTR_HEADER</string>
+ <reference key="NSSupport" ref="26"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="1021472174"/>
+ </object>
+ <object class="NSButtonCell" key="NSDataCell" id="214434166">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134348800</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="178750169"/>
+ <int key="NSButtonFlags">1215582719</int>
+ <int key="NSButtonFlags2">130</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSSwitch</string>
+ </object>
+ <object class="NSButtonImageSource" key="NSAlternateImage">
+ <string key="NSImageName">NSSwitch</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <bool key="NSIsEditable">YES</bool>
+ <reference key="NSTableView" ref="178750169"/>
+ </object>
</object>
<double key="NSIntercellSpacingWidth">3.000000e+00</double>
<double key="NSIntercellSpacingHeight">2.000000e+00</double>
@@ -233,7 +274,7 @@
<object class="NSScroller" id="984908608">
<reference key="NSNextResponder" ref="832680793"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{368, 17}, {15, 327}}</string>
+ <string key="NSFrame">{{477, 17}, {15, 336}}</string>
<reference key="NSSuperview" ref="832680793"/>
<reference key="NSTarget" ref="832680793"/>
<string key="NSAction">_doScroller:</string>
@@ -242,12 +283,12 @@
<object class="NSScroller" id="689783017">
<reference key="NSNextResponder" ref="832680793"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{1, 344}, {367, 15}}</string>
+ <string key="NSFrame">{{1, 353}, {476, 15}}</string>
<reference key="NSSuperview" ref="832680793"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="832680793"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSPercent">9.973890e-01</double>
+ <double key="NSPercent">7.361319e-01</double>
</object>
<object class="NSClipView" id="522115304">
<reference key="NSNextResponder" ref="832680793"/>
@@ -613,6 +654,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="20203331"/>
<reference ref="332085935"/>
+ <reference ref="972931040"/>
</object>
<reference key="parent" ref="832680793"/>
</object>
@@ -753,6 +795,20 @@
<reference key="object" ref="985169067"/>
<reference key="parent" ref="13599172"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">68</int>
+ <reference key="object" ref="972931040"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="214434166"/>
+ </object>
+ <reference key="parent" ref="178750169"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">72</int>
+ <reference key="object" ref="214434166"/>
+ <reference key="parent" ref="972931040"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -791,7 +847,9 @@
<string>54.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
<string>64.IBPluginDependency</string>
+ <string>68.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
+ <string>72.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
@@ -800,10 +858,10 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{507, 468}, {533, 448}}</string>
+ <string>{{257, 468}, {533, 448}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" id="5"/>
- <string>{{507, 468}, {533, 448}}</string>
+ <string>{{257, 468}, {533, 448}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -832,6 +890,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -854,7 +914,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">67</int>
+ <int key="maxID">72</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -997,6 +1057,13 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/objc_zombie.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/cocoa/status_bubble_mac.h</string>
</object>
</object>
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/cocoa/content_exceptions_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698