summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-01 15:49:40 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-01 15:49:40 +0000
commit31a9bdff16526415c4c00aba0cb41cc6654d3e69 (patch)
treeabfe58dafc422de5748b247a506f353be59d3818 /chrome/app
parent97976f721ede0d4524f8e5a5154385165a3fa838 (diff)
downloadchromium_src-31a9bdff16526415c4c00aba0cb41cc6654d3e69.zip
chromium_src-31a9bdff16526415c4c00aba0cb41cc6654d3e69.tar.gz
chromium_src-31a9bdff16526415c4c00aba0cb41cc6654d3e69.tar.bz2
Remove popup blocking pref as it's not on windows.
BUG=13160 TEST=none Review URL: http://codereview.chromium.org/150163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/nibs/en.lproj/Preferences.xib83
1 files changed, 22 insertions, 61 deletions
diff --git a/chrome/app/nibs/en.lproj/Preferences.xib b/chrome/app/nibs/en.lproj/Preferences.xib
index 4d2c2aa..890224b 100644
--- a/chrome/app/nibs/en.lproj/Preferences.xib
+++ b/chrome/app/nibs/en.lproj/Preferences.xib
@@ -8,8 +8,8 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="74"/>
<integer value="4"/>
+ <integer value="74"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -940,6 +940,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string key="NSFrame">{{1, 1}, {282, 63}}</string>
<reference key="NSSuperview" ref="54854923"/>
+ <reference key="NSNextKeyView" ref="165250101"/>
<reference key="NSDocView" ref="165250101"/>
<reference key="NSBGColor" ref="452188023"/>
<int key="NScvFlags">4</int>
@@ -967,6 +968,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string key="NSFrame">{{171, 295}, {284, 65}}</string>
<reference key="NSSuperview" ref="412364894"/>
+ <reference key="NSNextKeyView" ref="570210247"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="895676258"/>
<reference key="NSHScroller" ref="757862790"/>
@@ -1769,7 +1771,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="287656702">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 262}, {146, 17}}</string>
+ <string key="NSFrame">{{17, 256}, {146, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="237538019">
@@ -1785,7 +1787,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="412658410">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{43, 287}, {421, 59}}</string>
+ <string key="NSFrame">{{43, 281}, {421, 59}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="786981193">
@@ -1820,7 +1822,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSButton" id="348105916">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{26, 346}, {220, 32}}</string>
+ <string key="NSFrame">{{22, 340}, {220, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1018797611">
@@ -1903,32 +1905,10 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="1006300402">
- <reference key="NSNextResponder" ref="1016273328"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{30, 238}, {382, 18}}</string>
- <reference key="NSSuperview" ref="1016273328"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="361860150">
- <int key="NSCellFlags">-1543373312</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Notify me when a pop-up is blocked</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="1006300402"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="934078207"/>
- <reference key="NSAlternateImage" ref="927168675"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSButton" id="514356928">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{56, 99}, {174, 32}}</string>
+ <string key="NSFrame">{{56, 115}, {174, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="821186353">
@@ -1948,7 +1928,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSTextField" id="860741341">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 163}, {146, 17}}</string>
+ <string key="NSFrame">{{17, 179}, {146, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="240354523">
@@ -1986,7 +1966,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSTextField" id="886068350">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{29, 138}, {193, 17}}</string>
+ <string key="NSFrame">{{29, 154}, {193, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="550006091">
@@ -2002,7 +1982,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSButton" id="733677494">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{30, 71}, {276, 18}}</string>
+ <string key="NSFrame">{{30, 87}, {276, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="694359929">
@@ -2024,7 +2004,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSTextField" id="319078021">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{29, 48}, {330, 17}}</string>
+ <string key="NSFrame">{{29, 64}, {330, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="789709547">
@@ -2076,7 +2056,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSPopUpButton" id="333355502">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{53, 16}, {237, 26}}</string>
+ <string key="NSFrame">{{53, 32}, {237, 26}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="753519282">
@@ -2231,7 +2211,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<string>NSFilenamesPboardType</string>
</object>
</object>
- <string key="NSFrame">{{24, 409}, {179, 26}}</string>
+ <string key="NSFrame">{{20, 402}, {179, 26}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPathCell" key="NSCell" id="25958950">
@@ -2249,7 +2229,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSButton" id="928184762">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{30, 387}, {323, 18}}</string>
+ <string key="NSFrame">{{32, 378}, {323, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="731161158">
@@ -2271,7 +2251,7 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<object class="NSButton" id="777041502">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{20, 192}, {275, 32}}</string>
+ <string key="NSFrame">{{22, 208}, {275, 32}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="526979400">
@@ -3253,21 +3233,20 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<reference ref="913832943"/>
<reference ref="1054376288"/>
<reference ref="685290609"/>
- <reference ref="287656702"/>
- <reference ref="412658410"/>
+ <reference ref="630848197"/>
+ <reference ref="346222444"/>
+ <reference ref="484273049"/>
+ <reference ref="928184762"/>
<reference ref="348105916"/>
- <reference ref="1006300402"/>
+ <reference ref="412658410"/>
+ <reference ref="287656702"/>
+ <reference ref="777041502"/>
<reference ref="514356928"/>
<reference ref="860741341"/>
<reference ref="886068350"/>
<reference ref="733677494"/>
<reference ref="319078021"/>
<reference ref="333355502"/>
- <reference ref="630848197"/>
- <reference ref="484273049"/>
- <reference ref="928184762"/>
- <reference ref="777041502"/>
- <reference ref="346222444"/>
</object>
<reference key="parent" ref="1002"/>
<string key="objectName">Under The Hood</string>
@@ -3457,20 +3436,6 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<reference key="parent" ref="808321623"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">120</int>
- <reference key="object" ref="1006300402"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="361860150"/>
- </object>
- <reference key="parent" ref="1016273328"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">121</int>
- <reference key="object" ref="361860150"/>
- <reference key="parent" ref="1006300402"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">122</int>
<reference key="object" ref="514356928"/>
<object class="NSMutableArray" key="children">
@@ -4022,8 +3987,6 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</string>
<string>117.IBPluginDependency</string>
<string>118.IBPluginDependency</string>
<string>119.IBPluginDependency</string>
- <string>120.IBPluginDependency</string>
- <string>121.IBPluginDependency</string>
<string>122.IBPluginDependency</string>
<string>123.IBPluginDependency</string>
<string>126.IBPluginDependency</string>
@@ -4199,8 +4162,6 @@ aWVuY2Ug4oCUIHlvdSBtYXkgb3B0aW9uYWxseSBkaXNhYmxlIHRoZXNlIHNlcnZpY2VzLg</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>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{772, 130}, {243, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
generated by cgit v1.1 at 2025-01-19 21:48:32 +0000