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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 650124: Mac: Move prefs around in preparation for the content settings window. (Closed)
Patch Set: done? Created 10 years, 10 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/nibs/ContentSettings.xib ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | chrome/browser/cocoa/browser_window_cocoa.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/Preferences.xib
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index cb66596c03866ed13e578f268960aa4a3cdecb97..71c46a3f1cd4bdc2d7247cdc304ca46b14831e53 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -3,13 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">680</string>
+ <string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="74"/>
- <integer value="482"/>
<integer value="481"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -189,7 +188,7 @@
<object class="NSTextField" id="1032231978">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 628}, {447, 17}}</string>
+ <string key="NSFrame">{{17, 586}, {447, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="710610494">
@@ -262,7 +261,7 @@
<object class="NSTextField" id="1043699198">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{29, 603}, {397, 17}}</string>
+ <string key="NSFrame">{{29, 509}, {397, 17}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="494850700">
@@ -298,7 +297,7 @@
<object class="NSButton" id="480577047">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 543}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 449}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="298042898">
@@ -325,7 +324,7 @@
<object class="NSButton" id="808321623">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 523}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 429}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="874031585">
@@ -347,7 +346,7 @@
<object class="NSButton" id="139965100">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 503}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 409}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="647261577">
@@ -405,7 +404,7 @@
<object class="NSButton" id="217654608">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 483}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 389}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="935362863">
@@ -462,114 +461,6 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSTextField" id="913832943">
- <reference key="NSNextResponder" ref="1016273328"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{29, 430}, {397, 17}}</string>
- <reference key="NSSuperview" ref="1016273328"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="589077222">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">272629760</int>
- <string key="NSContents">^IDS_OPTIONS_COOKIES_ACCEPT_LABEL</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="913832943"/>
- <reference key="NSBackgroundColor" ref="592613688"/>
- <reference key="NSTextColor" ref="748094473"/>
- </object>
- </object>
- <object class="NSButton" id="1054376288">
- <reference key="NSNextResponder" ref="1016273328"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{38, 363}, {200, 32}}</string>
- <reference key="NSSuperview" ref="1016273328"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="441531293">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">^IDS_OPTIONS_COOKIES_SHOWCOOKIES_WEBSITE_PERMISSIONS</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="1054376288"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSPopUpButton" id="685290609">
- <reference key="NSNextResponder" ref="1016273328"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{41, 398}, {202, 26}}</string>
- <reference key="NSSuperview" ref="1016273328"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="583724370">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">2048</int>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="685290609"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="202272761">
- <reference key="NSMenu" ref="12577397"/>
- <string key="NSTitle">^IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="212205841">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="171904678">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="583724370"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="12577397">
- <string key="NSTitle">OtherViews</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="549082417">
- <reference key="NSMenu" ref="12577397"/>
- <string key="NSTitle">^IDS_OPTIONS_COOKIES_ACCEPT_ALL_COOKIES</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="212205841"/>
- <reference key="NSMixedImage" ref="171904678"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="583724370"/>
- </object>
- <object class="NSMenuItem" id="139625100">
- <reference key="NSMenu" ref="12577397"/>
- <string key="NSTitle">^IDS_OPTIONS_COOKIES_RESTRICT_THIRD_PARTY_COOKIES</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="212205841"/>
- <reference key="NSMixedImage" ref="171904678"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="583724370"/>
- </object>
- <reference ref="202272761"/>
- </object>
- </object>
- <int key="NSSelectedIndex">2</int>
- <int key="NSPreferredEdge">1</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">2</int>
- </object>
- </object>
<object class="NSTextField" id="630848197">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
@@ -661,7 +552,7 @@
<object class="NSButton" id="346222444">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{30, 463}, {395, 18}}</string>
+ <string key="NSFrame">{{30, 369}, {395, 18}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="209704674">
@@ -683,7 +574,7 @@
<object class="NSButton" id="732733616">
<reference key="NSNextResponder" ref="1016273328"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{29, 581}, {96, 16}}</string>
+ <string key="NSFrame">{{29, 487}, {96, 16}}</string>
<reference key="NSSuperview" ref="1016273328"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="21803731">
@@ -700,8 +591,48 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="553918619">
+ <reference key="NSNextResponder" ref="1016273328"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{228, 538}, {150, 32}}</string>
+ <reference key="NSSuperview" ref="1016273328"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="871001089">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="553918619"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="246942000">
+ <reference key="NSNextResponder" ref="1016273328"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{26, 538}, {202, 32}}</string>
+ <reference key="NSSuperview" ref="1016273328"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="42833123">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="246942000"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{443, 665}</string>
+ <string key="NSFrameSize">{443, 623}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -1228,7 +1159,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string key="NSFrame">{{1, 1}, {305, 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>
@@ -1256,7 +1186,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string key="NSFrame">{{203, 321}, {307, 65}}</string>
<reference key="NSSuperview" ref="930668015"/>
- <reference key="NSNextKeyView" ref="570210247"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="895676258"/>
<reference key="NSHScroller" ref="757862790"/>
@@ -1619,8 +1548,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSOnImage" ref="212205841"/>
- <reference key="NSMixedImage" ref="171904678"/>
+ <object class="NSCustomResource" key="NSOnImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="197973245"/>
</object>
@@ -1703,14 +1638,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="393583039">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="173446497">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 248}, {128, 68}}</string>
+ <string key="NSFrame">{{17, 215}, {128, 68}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="218087448">
@@ -1726,7 +1661,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="20640598">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 361}, {128, 60}}</string>
+ <string key="NSFrame">{{17, 328}, {128, 60}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="101746388">
@@ -1742,7 +1677,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMatrix" id="1019357609">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{152, 278}, {358, 38}}</string>
+ <string key="NSFrame">{{152, 245}, {358, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -1934,7 +1869,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="667220499">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 240}, {184, 32}}</string>
+ <string key="NSFrame">{{146, 207}, {184, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="745829249">
@@ -1954,7 +1889,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="203729106">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 393}, {184, 32}}</string>
+ <string key="NSFrame">{{146, 360}, {184, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="431766699">
@@ -1990,7 +1925,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="212252045">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 183}, {128, 38}}</string>
+ <string key="NSFrame">{{17, 150}, {128, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="677476881">
@@ -2006,7 +1941,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="155299174">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 48}, {128, 74}}</string>
+ <string key="NSFrame">{{17, 38}, {128, 51}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="340834043">
@@ -2022,7 +1957,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="90260648">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{152, 365}, {361, 28}}</string>
+ <string key="NSFrame">{{152, 332}, {361, 28}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="123936632">
@@ -2039,7 +1974,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="885386403">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 95}, {118, 32}}</string>
+ <string key="NSFrame">{{146, 62}, {118, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325720834">
@@ -2056,30 +1991,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="987908490">
- <reference key="NSNextResponder" ref="393583039"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 63}, {252, 32}}</string>
- <reference key="NSSuperview" ref="393583039"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="551321318">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">^IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON</string>
- <reference key="NSSupport" ref="445696277"/>
- <reference key="NSControlView" ref="987908490"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSMatrix" id="854747859">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{152, 183}, {358, 38}}</string>
+ <string key="NSFrame">{{152, 150}, {358, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -2291,7 +2206,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="1022040155">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 340}, {82, 17}}</string>
+ <string key="NSFrame">{{152, 307}, {82, 17}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1047338722">
@@ -2331,7 +2246,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="501995472">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 145}, {118, 32}}</string>
+ <string key="NSFrame">{{146, 112}, {118, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="656411812">
@@ -2349,8 +2264,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{530, 441}</string>
- <reference key="NSSuperview"/>
+ <string key="NSFrameSize">{530, 408}</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="933437956">
@@ -2776,14 +2690,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="connectionID">375</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">clearData:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="987908490"/>
- </object>
- <int key="connectionID">376</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">contentArray: customPagesSource.customHomePages</string>
<reference key="source" ref="495015235"/>
@@ -2985,22 +2891,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="connectionID">440</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">selectedIndex: cookieBehavior</string>
- <reference key="source" ref="685290609"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="685290609"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">selectedIndex: cookieBehavior</string>
- <string key="NSBinding">selectedIndex</string>
- <string key="NSKeyPath">cookieBehavior</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">443</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">themesGallery:</string>
<reference key="source" ref="1001"/>
@@ -3374,14 +3264,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">object3_</string>
- <reference key="source" ref="481147379"/>
- <reference key="destination" ref="987908490"/>
- </object>
- <int key="connectionID">570</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">object1_</string>
<reference key="source" ref="487772665"/>
<reference key="destination" ref="921350969"/>
@@ -3606,14 +3488,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">showCookies:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="1054376288"/>
- </object>
- <int key="connectionID">618</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">changeFontAndLanguageSettings:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="777041502"/>
@@ -3676,6 +3550,38 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">631</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">clearData:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="553918619"/>
+ </object>
+ <int key="connectionID">636</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showContentSettings:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="246942000"/>
+ </object>
+ <int key="connectionID">637</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">clearDataButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="553918619"/>
+ </object>
+ <int key="connectionID">639</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">contentSettingsButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="246942000"/>
+ </object>
+ <int key="connectionID">640</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -3729,7 +3635,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="1016273328"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="685290609"/>
<reference ref="1032231978"/>
<reference ref="1043699198"/>
<reference ref="732733616"/>
@@ -3738,7 +3643,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="139965100"/>
<reference ref="217654608"/>
<reference ref="346222444"/>
- <reference ref="913832943"/>
<reference ref="602116533"/>
<reference ref="412658410"/>
<reference ref="348105916"/>
@@ -3751,7 +3655,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="860741341"/>
<reference ref="886068350"/>
<reference ref="733677494"/>
- <reference ref="1054376288"/>
+ <reference ref="246942000"/>
+ <reference ref="553918619"/>
</object>
<reference key="parent" ref="956860932"/>
<string key="objectName">Under the Hood Content</string>
@@ -3897,78 +3802,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="parent" ref="733677494"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">140</int>
- <reference key="object" ref="913832943"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="589077222"/>
- </object>
- <reference key="parent" ref="1016273328"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">141</int>
- <reference key="object" ref="589077222"/>
- <reference key="parent" ref="913832943"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">142</int>
- <reference key="object" ref="1054376288"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="441531293"/>
- </object>
- <reference key="parent" ref="1016273328"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">143</int>
- <reference key="object" ref="441531293"/>
- <reference key="parent" ref="1054376288"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">150</int>
- <reference key="object" ref="685290609"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="583724370"/>
- </object>
- <reference key="parent" ref="1016273328"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">151</int>
- <reference key="object" ref="583724370"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="12577397"/>
- </object>
- <reference key="parent" ref="685290609"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">152</int>
- <reference key="object" ref="12577397"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="202272761"/>
- <reference ref="139625100"/>
- <reference ref="549082417"/>
- </object>
- <reference key="parent" ref="583724370"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">153</int>
- <reference key="object" ref="202272761"/>
- <reference key="parent" ref="12577397"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">154</int>
- <reference key="object" ref="139625100"/>
- <reference key="parent" ref="12577397"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">155</int>
- <reference key="object" ref="549082417"/>
- <reference key="parent" ref="12577397"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">26</int>
<reference key="object" ref="630848197"/>
<object class="NSMutableArray" key="children">
@@ -4149,7 +3982,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="921350969"/>
<reference ref="155299174"/>
<reference ref="885386403"/>
- <reference ref="987908490"/>
<reference ref="423027085"/>
<reference ref="865039969"/>
<reference ref="501995472"/>
@@ -4268,20 +4100,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="parent" ref="885386403"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">353</int>
- <reference key="object" ref="987908490"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="551321318"/>
- </object>
- <reference key="parent" ref="393583039"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">354</int>
- <reference key="object" ref="551321318"/>
- <reference key="parent" ref="987908490"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">362</int>
<reference key="object" ref="854747859"/>
<object class="NSMutableArray" key="children">
@@ -4916,6 +4734,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="656411812"/>
<reference key="parent" ref="501995472"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">632</int>
+ <reference key="object" ref="553918619"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="871001089"/>
+ </object>
+ <reference key="parent" ref="1016273328"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">633</int>
+ <reference key="object" ref="871001089"/>
+ <reference key="parent" ref="553918619"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">634</int>
+ <reference key="object" ref="246942000"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="42833123"/>
+ </object>
+ <reference key="parent" ref="1016273328"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">635</int>
+ <reference key="object" ref="42833123"/>
+ <reference key="parent" ref="246942000"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4945,17 +4791,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>131.IBPluginDependency</string>
<string>136.IBPluginDependency</string>
<string>137.IBPluginDependency</string>
- <string>140.IBPluginDependency</string>
- <string>141.IBPluginDependency</string>
- <string>142.IBPluginDependency</string>
- <string>143.IBPluginDependency</string>
- <string>150.IBPluginDependency</string>
- <string>151.IBPluginDependency</string>
- <string>152.IBEditorWindowLastContentRect</string>
- <string>152.IBPluginDependency</string>
- <string>153.IBPluginDependency</string>
- <string>154.IBPluginDependency</string>
- <string>155.IBPluginDependency</string>
<string>156.IBPluginDependency</string>
<string>157.IBPluginDependency</string>
<string>158.IBPluginDependency</string>
@@ -4991,8 +4826,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>347.IBViewIntegration.shadowOffsetWidth</string>
<string>348.IBPluginDependency</string>
<string>35.IBPluginDependency</string>
- <string>353.IBPluginDependency</string>
- <string>354.IBPluginDependency</string>
<string>36.IBPluginDependency</string>
<string>362.IBPluginDependency</string>
<string>363.IBPluginDependency</string>
@@ -5088,6 +4921,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>628.IBViewIntegration.shadowOffsetWidth</string>
<string>629.IBPluginDependency</string>
<string>63.IBPluginDependency</string>
+ <string>632.IBPluginDependency</string>
+ <string>633.IBPluginDependency</string>
+ <string>634.IBPluginDependency</string>
+ <string>635.IBPluginDependency</string>
<string>64.IBPluginDependency</string>
<string>65.IBPluginDependency</string>
<string>66.IBPluginDependency</string>
@@ -5145,17 +4982,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{587, 561}, {473, 63}}</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>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>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5195,9 +5021,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<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>{{271, 431}, {170, 23}}</string>
+ <string>{{253, 480}, {243, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5225,7 +5049,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
- <string>{{181, 357}, {530, 441}}</string>
+ <string>{{48, 418}, {530, 408}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{87, 136}, {530, 463}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5291,7 +5115,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{783, 191}, {443, 665}}</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>{{296, 233}, {443, 623}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5331,7 +5159,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">631</int>
+ <int key="maxID">640</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5487,7 +5315,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>resetThemeToDefault:</string>
<string>showAutoFillSettings:</string>
<string>showCertificates:</string>
- <string>showCookies:</string>
+ <string>showContentSettings:</string>
<string>showPreferences:</string>
<string>showSavedPasswords:</string>
<string>themesGallery:</string>
@@ -5528,6 +5356,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>basicsGroupStartup_</string>
<string>basicsGroupToolbar_</string>
<string>basicsView_</string>
+ <string>clearDataButton_</string>
+ <string>contentSettingsButton_</string>
<string>customPagesArrayController_</string>
<string>downloadLocationButton_</string>
<string>downloadLocationControl_</string>
@@ -5554,6 +5384,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSArray</string>
<string>NSArray</string>
<string>NSView</string>
+ <string>NSButton</string>
+ <string>NSButton</string>
<string>NSArrayController</string>
<string>NSButton</string>
<string>NSPathControl</string>
« no previous file with comments | « chrome/app/nibs/ContentSettings.xib ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | chrome/browser/cocoa/browser_window_cocoa.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698