diff options
Diffstat (limited to 'chrome')
23 files changed, 934 insertions, 408 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 5f7874c..7991ccb 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5040,9 +5040,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Block All Cookies </message> </if> - <message name="IDS_OPTIONS_COOKIES_SHOWCOOKIES_WEBSITE_PERMISSIONS" desc="The label of the 'Show Cookies and Website Permissions' button. Website Permissions means you can set permissions for individual websites, such as google.com can do this, yahoo.com can do that."> - Show cookies and website permissions - </message> <message name="IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION" desc="The label of the 'Enable phishing and malware protection' checkbox"> Enable phishing and malware protection </message> diff --git a/chrome/app/nibs/ClearBrowsingData.xib b/chrome/app/nibs/ClearBrowsingData.xib index 9654f79..a8f3450 100644 --- a/chrome/app/nibs/ClearBrowsingData.xib +++ b/chrome/app/nibs/ClearBrowsingData.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="22"/> + <integer value="2"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -37,7 +37,7 @@ <object class="NSWindowTemplate" id="1005"> <int key="NSWindowStyleMask">1</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 211}, {331, 299}}</string> + <string key="NSWindowRect">{{196, 178}, {331, 332}}</string> <int key="NSWTFlags">536871936</int> <string key="NSWindowTitle">^IDS_CLEAR_BROWSING_DATA_TITLE</string> <string key="NSWindowClass">NSWindow</string> @@ -51,7 +51,7 @@ <object class="NSPopUpButton" id="836936583"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{189, 56}, {125, 26}}</string> + <string key="NSFrame">{{189, 89}, {125, 26}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="744820906"> @@ -148,7 +148,7 @@ <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">1292</int> <object class="NSPSMatrix" key="NSDrawMatrix"/> - <string key="NSFrame">{{20, 20}, {16, 16}}</string> + <string key="NSFrame">{{20, 53}, {16, 16}}</string> <reference key="NSSuperview" ref="1006"/> <int key="NSpiFlags">28938</int> <double key="NSMinValue">1.600000e+01</double> @@ -297,7 +297,7 @@ </object> </object> </object> - <string key="NSFrame">{{34, 86}, {256, 168}}</string> + <string key="NSFrame">{{34, 119}, {256, 168}}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSClassName">GTMWidthBasedTweaker</string> </object> @@ -339,7 +339,7 @@ </object> </object> </object> - <string key="NSFrame">{{0, 257}, {331, 42}}</string> + <string key="NSFrame">{{0, 290}, {331, 42}}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSClassName">GTMWidthBasedTweaker</string> </object> @@ -365,7 +365,7 @@ </object> </object> </object> - <string key="NSFrame">{{0, 55}, {189, 30}}</string> + <string key="NSFrame">{{0, 88}, {189, 30}}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSClassName">GTMWidthBasedTweaker</string> </object> @@ -377,7 +377,7 @@ <object class="NSButton" id="110601986"> <reference key="NSNextResponder" ref="1053951760"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{14, 12}, {96, 32}}</string> + <string key="NSFrame">{{11, 1}, {96, 32}}</string> <reference key="NSSuperview" ref="1053951760"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="158868682"> @@ -397,7 +397,7 @@ <object class="NSButton" id="340114853"> <reference key="NSNextResponder" ref="1053951760"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{110, 12}, {166, 32}}</string> + <string key="NSFrame">{{107, 1}, {166, 32}}</string> <reference key="NSSuperview" ref="1053951760"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="817836045"> @@ -415,12 +415,72 @@ </object> </object> </object> - <string key="NSFrame">{{41, 0}, {290, 47}}</string> + <string key="NSFrame">{{41, 44}, {290, 36}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSBox" id="344634388"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">34</int> + <string key="NSFrame">{{12, 42}, {307, 5}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Box</string> + <reference key="NSSupport" ref="561508160"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> + </object> + </object> + <int key="NSBorderType">3</int> + <int key="NSBoxType">2</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> + </object> + <object class="NSCustomView" id="190457555"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="220673449"> + <reference key="NSNextResponder" ref="190457555"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{20, 20}, {96, 16}}</string> + <reference key="NSSuperview" ref="190457555"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="500549401"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_FLASH_STORAGE_SETTINGS</string> + <reference key="NSSupport" ref="561508160"/> + <reference key="NSControlView" ref="220673449"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">134</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{136, 45}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSClassName">GTMWidthBasedTweaker</string> </object> </object> - <string key="NSFrameSize">{331, 299}</string> + <string key="NSFrameSize">{331, 332}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> @@ -844,6 +904,14 @@ </object> <int key="connectionID">113</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">openFlashPlayerSettings:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="220673449"/> + </object> + <int key="connectionID">119</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -894,6 +962,8 @@ <reference ref="188012693"/> <reference ref="925363464"/> <reference ref="1053951760"/> + <reference ref="344634388"/> + <reference ref="190457555"/> </object> <reference key="parent" ref="1005"/> </object> @@ -1155,6 +1225,34 @@ <reference key="object" ref="438778627"/> <reference key="parent" ref="212748305"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">115</int> + <reference key="object" ref="344634388"/> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">118</int> + <reference key="object" ref="190457555"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="220673449"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">116</int> + <reference key="object" ref="220673449"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="500549401"/> + </object> + <reference key="parent" ref="190457555"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">117</int> + <reference key="object" ref="500549401"/> + <reference key="parent" ref="220673449"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1172,6 +1270,10 @@ <string>1.editorWindowContentRectSynchronizationRect</string> <string>11.IBPluginDependency</string> <string>114.IBPluginDependency</string> + <string>115.IBPluginDependency</string> + <string>116.IBPluginDependency</string> + <string>117.CustomClassName</string> + <string>117.IBPluginDependency</string> <string>12.IBPluginDependency</string> <string>13.IBPluginDependency</string> <string>14.IBPluginDependency</string> @@ -1209,9 +1311,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{432, 414}, {331, 299}}</string> + <string>{{283, 399}, {331, 332}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{432, 414}, {331, 299}}</string> + <string>{{283, 399}, {331, 332}}</string> <reference ref="6"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> @@ -1219,13 +1321,17 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>HyperlinkButtonCell</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>{{610, 393}, {289, 103}}</string> + <string>{{461, 411}, {289, 103}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1270,7 +1376,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">114</int> + <int key="maxID">119</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1292,11 +1398,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>cancel:</string> <string>clearData:</string> + <string>openFlashPlayerSettings:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -1371,6 +1479,21 @@ <reference key="sourceIdentifier" ref="486988642"/> </object> <object class="IBPartialClassDescription"> + <string key="className">HyperlinkButtonCell</string> + <string key="superclassName">NSButtonCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/hyperlink_button_cell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMenuItem</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/nsmenuitem_additions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> diff --git a/chrome/app/nibs/ContentBlockedCookies.xib b/chrome/app/nibs/ContentBlockedCookies.xib index 20e5f73..8b50f8a 100644 --- a/chrome/app/nibs/ContentBlockedCookies.xib +++ b/chrome/app/nibs/ContentBlockedCookies.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="1"/> + <integer value="28"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -135,7 +135,7 @@ <reference key="NSSuperview" ref="730386640"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="319182835"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> <string key="NSContents">^IDS_BLOCKED_COOKIES_LINK</string> <reference key="NSSupport" ref="26"/> @@ -498,14 +498,12 @@ <string>allowBlockToggled:</string> <string>closeBubble:</string> <string>manageBlocking:</string> - <string>popupLinkClicked:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> diff --git a/chrome/app/nibs/ContentBlockedImages.xib b/chrome/app/nibs/ContentBlockedImages.xib index ec6b0862..bc84d6f 100644 --- a/chrome/app/nibs/ContentBlockedImages.xib +++ b/chrome/app/nibs/ContentBlockedImages.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="28"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -332,7 +332,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSSuperview" ref="730386640"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="319182835"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> <string key="NSContents">^IDS_BLOCKED_IMAGES_LINK</string> <reference key="NSSupport" ref="26"/> @@ -746,14 +746,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>allowBlockToggled:</string> <string>closeBubble:</string> <string>manageBlocking:</string> - <string>popupLinkClicked:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> diff --git a/chrome/app/nibs/ContentBlockedJavaScript.xib b/chrome/app/nibs/ContentBlockedJavaScript.xib index 0d7de79..63b9098 100644 --- a/chrome/app/nibs/ContentBlockedJavaScript.xib +++ b/chrome/app/nibs/ContentBlockedJavaScript.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="28"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -332,7 +332,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSSuperview" ref="730386640"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="319182835"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> <string key="NSContents">^IDS_BLOCKED_JAVASCRIPT_LINK</string> <reference key="NSSupport" ref="26"/> diff --git a/chrome/app/nibs/ContentBlockedPlugins.xib b/chrome/app/nibs/ContentBlockedPlugins.xib index 5df4514..f3f4116 100644 --- a/chrome/app/nibs/ContentBlockedPlugins.xib +++ b/chrome/app/nibs/ContentBlockedPlugins.xib @@ -332,7 +332,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSSuperview" ref="730386640"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="319182835"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> <string key="NSContents">^IDS_BLOCKED_PLUGINS_LINK</string> <reference key="NSSupport" ref="26"/> @@ -746,14 +746,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>allowBlockToggled:</string> <string>closeBubble:</string> <string>manageBlocking:</string> - <string>popupLinkClicked:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> diff --git a/chrome/app/nibs/ContentBlockedPopups.xib b/chrome/app/nibs/ContentBlockedPopups.xib index a3f7591..38a66b1 100644 --- a/chrome/app/nibs/ContentBlockedPopups.xib +++ b/chrome/app/nibs/ContentBlockedPopups.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="4"/> + <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -281,8 +281,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> </object> - <int key="NSSelectedRow">1</int> - <reference key="NSSelectedCell" ref="619648789"/> + <reference key="NSSelectedCell" ref="193088222"/> <reference key="NSBackgroundColor" ref="657398381"/> <object class="NSColor" key="NSCellBackgroundColor" id="968406066"> <int key="NSColorSpace">3</int> @@ -333,7 +332,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSSuperview" ref="730386640"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="319182835"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> <string key="NSContents">^IDS_BLOCKED_POPUPS_LINK</string> <reference key="NSSupport" ref="26"/> diff --git a/chrome/app/nibs/ContentSettings.xib b/chrome/app/nibs/ContentSettings.xib new file mode 100644 index 0000000..ebe531e5 --- /dev/null +++ b/chrome/app/nibs/ContentSettings.xib @@ -0,0 +1,405 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> + <data> + <int key="IBDocument.SystemTarget">1050</int> + <string key="IBDocument.SystemVersion">9L31a</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="2"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomObject" id="1001"> + <string key="NSClassName">ContentSettingsDialogController</string> + </object> + <object class="NSCustomObject" id="1003"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="1004"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSWindowTemplate" id="1005"> + <int key="NSWindowStyleMask">15</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{196, 307}, {368, 203}}</string> + <int key="NSWTFlags">536870912</int> + <string key="NSWindowTitle">^IDS_CONTENT_SETTINGS_TITLE</string> + <string key="NSWindowClass">NSWindow</string> + <nil key="NSViewClass"/> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <object class="NSView" key="NSWindowView" id="1006"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="776542013"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{54, 133}, {259, 17}}</string> + <reference key="NSSuperview" ref="1006"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="896994552"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">These settings are not yet implemented.</string> + <object class="NSFont" key="NSSupport" id="793851927"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="776542013"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> + </object> + </object> + <object class="NSButton" id="905620757"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{14, 12}, {296, 32}}</string> + <reference key="NSSuperview" ref="1006"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="645604930"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_COOKIES_SHOW_COOKIES_BUTTON</string> + <reference key="NSSupport" ref="793851927"/> + <reference key="NSControlView" ref="905620757"/> + <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">{368, 203}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + </object> + <object class="NSCustomObject" id="517971397"> + <string key="NSClassName">ChromeUILocalizer</string> + </object> + <object class="NSCustomObject" id="644719285"> + <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string> + </object> + </object> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <object class="NSMutableArray" key="connectionRecords"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1005"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">5</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">6</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">showCookies:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="905620757"/> + </object> + <int key="connectionID">9</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">localizer_</string> + <reference key="source" ref="644719285"/> + <reference key="destination" ref="517971397"/> + </object> + <int key="connectionID">12</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">uiObject_</string> + <reference key="source" ref="644719285"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">13</int> + </object> + </object> + <object class="IBMutableOrderedSet" key="objectRecords"> + <object class="NSArray" key="orderedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <object class="NSArray" key="object" id="1002"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <reference key="children" ref="1000"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="1001"/> + <reference key="parent" ref="1002"/> + <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="1003"/> + <reference key="parent" ref="1002"/> + <string key="objectName">First Responder</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-3</int> + <reference key="object" ref="1004"/> + <reference key="parent" ref="1002"/> + <string key="objectName">Application</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1</int> + <reference key="object" ref="1005"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1006"/> + </object> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2</int> + <reference key="object" ref="1006"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="776542013"/> + <reference ref="905620757"/> + </object> + <reference key="parent" ref="1005"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">3</int> + <reference key="object" ref="776542013"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="896994552"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">4</int> + <reference key="object" ref="896994552"/> + <reference key="parent" ref="776542013"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7</int> + <reference key="object" ref="905620757"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="645604930"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8</int> + <reference key="object" ref="645604930"/> + <reference key="parent" ref="905620757"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">10</int> + <reference key="object" ref="517971397"/> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">11</int> + <reference key="object" ref="644719285"/> + <reference key="parent" ref="1002"/> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="flattenedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.IBPluginDependency</string> + <string>-2.IBPluginDependency</string> + <string>-3.IBPluginDependency</string> + <string>1.IBEditorWindowLastContentRect</string> + <string>1.IBPluginDependency</string> + <string>1.IBWindowTemplateEditedContentRect</string> + <string>1.NSWindowTemplate.visibleAtLaunch</string> + <string>1.WindowOrigin</string> + <string>1.editorWindowContentRectSynchronizationRect</string> + <string>10.IBPluginDependency</string> + <string>11.IBPluginDependency</string> + <string>2.IBPluginDependency</string> + <string>3.IBPluginDependency</string> + <string>4.IBPluginDependency</string> + <string>7.IBPluginDependency</string> + <string>8.IBPluginDependency</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{173, 384}, {368, 203}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{173, 384}, {368, 203}}</string> + <boolean value="NO"/> + <string>{196, 240}</string> + <string>{{357, 418}, {480, 270}}</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> + </object> + </object> + <object class="NSMutableDictionary" key="unlocalizedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="activeLocalization"/> + <object class="NSMutableDictionary" key="localizations"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="sourceID"/> + <int key="maxID">13</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <object class="NSMutableArray" key="referencedPartialClassDescriptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ContentSettingsDialogController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showCookies:</string> + <string key="NS.object.0">id</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/content_settings_dialog_controller.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizerAndLayoutTweaker</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>localizerOwner_</string> + <string>localizer_</string> + <string>uiObject_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>GTMUILocalizer</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.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> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string> + </object> + </object> + </object> + </object> + <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + </data> +</archive> diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index cb66596c..71c46a3 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> diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h index 3f0542a..2b2d0c3 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.h +++ b/chrome/browser/cocoa/browser_window_cocoa.h @@ -12,8 +12,9 @@ class Browser; @class BrowserWindowController; @class FindBarCocoaController; -@class NSWindow; +@class NSEvent; @class NSMenu; +@class NSWindow; // An implementation of BrowserWindow for Cocoa. Bridges between C++ and // the Cocoa NSWindow. Cross-platform code will interact with this object when diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 4e5aaaf..b3dd1f4 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/cocoa/browser_window_cocoa.h" + #include "app/l10n_util_mac.h" #include "base/gfx/rect.h" #include "base/keyboard_codes.h" @@ -11,11 +13,11 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_list.h" #import "chrome/browser/cocoa/bookmark_manager_controller.h" -#include "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/bug_report_window_controller.h" -#import "chrome/browser/cocoa/clear_browsing_data_controller.h" #import "chrome/browser/cocoa/chrome_browser_window.h" +#import "chrome/browser/cocoa/clear_browsing_data_controller.h" +#import "chrome/browser/cocoa/content_settings_dialog_controller.h" #import "chrome/browser/cocoa/download_shelf_controller.h" #import "chrome/browser/cocoa/html_dialog_window_controller.h" #import "chrome/browser/cocoa/import_settings_dialog.h" @@ -317,9 +319,10 @@ void BrowserWindowCocoa::ShowRepostFormWarningDialog( } void BrowserWindowCocoa::ShowContentSettingsWindow( - ContentSettingsType content_type, + ContentSettingsType settings_type, Profile* profile) { - NOTIMPLEMENTED(); + [ContentSettingsDialogController showContentSettingsForType:settings_type + profile:profile]; } void BrowserWindowCocoa::ShowProfileErrorDialog(int message_id) { diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.h b/chrome/browser/cocoa/clear_browsing_data_controller.h index 3cc515b..efbf742 100644 --- a/chrome/browser/cocoa/clear_browsing_data_controller.h +++ b/chrome/browser/cocoa/clear_browsing_data_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -58,6 +58,7 @@ extern NSString* const kClearBrowsingDataControllerRemoveMask; // IBActions for the dialog buttons - (IBAction)clearData:(id)sender; - (IBAction)cancel:(id)sender; +- (IBAction)openFlashPlayerSettings:(id)sender; // Properties for bindings @property BOOL clearBrowsingHistory; diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.mm b/chrome/browser/cocoa/clear_browsing_data_controller.mm index cc7bd92..d4a05ff 100644 --- a/chrome/browser/cocoa/clear_browsing_data_controller.mm +++ b/chrome/browser/cocoa/clear_browsing_data_controller.mm @@ -1,16 +1,20 @@ -// Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #import "chrome/browser/cocoa/clear_browsing_data_controller.h" +#include "app/l10n_util.h" #include "base/mac_util.h" #include "base/scoped_nsobject.h" #include "base/singleton.h" +#include "chrome/browser/browser.h" +#include "chrome/browser/browser_window.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" +#include "grit/locale_settings.h" NSString* const kClearBrowsingDataControllerDidDelete = @"kClearBrowsingDataControllerDidDelete"; @@ -152,6 +156,18 @@ typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap; [self closeDialog]; } +// Called when the user clicks the "Flash Player storage settings" button. +- (IBAction)openFlashPlayerSettings:(id)sender { + // The "Clear Data" dialog is app-modal on OS X. Hence, close it before + // opening a tab with flash settings. + [self closeDialog]; + + Browser* browser = Browser::Create(profile_); + browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)), + GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); + browser->window()->Show(); +} + - (void)closeDialog { ProfileControllerMap* map = Singleton<ProfileControllerMap>::get(); ProfileControllerMap::iterator it = map->find(profile_); diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm index 35d885a..c27b124 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm +++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" + #include "app/l10n_util.h" #include "base/logging.h" #include "base/mac_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/blocked_popup_container.h" -#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" +#import "chrome/browser/cocoa/content_settings_dialog_controller.h" #import "chrome/browser/cocoa/hyperlink_button_cell.h" #import "chrome/browser/cocoa/info_bubble_view.h" #include "chrome/browser/host_content_settings_map.h" @@ -374,8 +376,12 @@ static NSString* ReplaceNSStringPlaceholders(NSString* formatString, } - (IBAction)manageBlocking:(id)sender { - // TODO(thakis): Implement, http://crbug.com/34894 - NOTIMPLEMENTED(); + if (tabContents_) { + tabContents_->delegate()->ShowContentSettingsWindow(settingsType_); + } else { + [ContentSettingsDialogController showContentSettingsForType:settingsType_ + profile:profile_]; + } } - (void)popupLinkClicked:(id)sender { diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm b/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm index e78508a5..9a6c93b 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" + #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" -#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.h b/chrome/browser/cocoa/content_settings_dialog_controller.h new file mode 100644 index 0000000..b5512c7 --- /dev/null +++ b/chrome/browser/cocoa/content_settings_dialog_controller.h @@ -0,0 +1,31 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import <Cocoa/Cocoa.h> + +#import "base/cocoa_protocols_mac.h" +#include "chrome/common/content_settings_types.h" +#include "chrome/browser/pref_member.h" + +class Profile; + +// This controller manages a dialog that lets the user manage the content +// settings for several content setting types. +@interface ContentSettingsDialogController + : NSWindowController<NSWindowDelegate> { + Profile* profile_; // weak + IntegerPrefMember lastSelectedTab_; +} + +// Show the content settings dialog associated with the given profile (or the +// original profile if this is an incognito profile). If no content settings +// dialog exists for this profile, create one and show it. Any resulting +// editor releases itself when closed. ++(id)showContentSettingsForType:(ContentSettingsType)settingsType + profile:(Profile*)profile; + +// Shows the cookies controller. +- (IBAction)showCookies:(id)sender; + +@end diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm new file mode 100644 index 0000000..620e96f --- /dev/null +++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm @@ -0,0 +1,89 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "chrome/browser/cocoa/content_settings_dialog_controller.h" + +#import <Cocoa/Cocoa.h> + +#include "base/mac_util.h" +#import "chrome/browser/cocoa/cookies_window_controller.h" +#include "chrome/browser/profile.h" +#include "chrome/common/pref_names.h" + + +namespace { + +// Stores the currently visible content settings dialog, if any. +ContentSettingsDialogController* g_instance = nil; + +} // namespace + + +@interface ContentSettingsDialogController(Private) +- (id)initWithProfile:(Profile*)profile; +@end + + +@implementation ContentSettingsDialogController + ++(id)showContentSettingsForType:(ContentSettingsType)settingsType + profile:(Profile*)profile { + profile = profile->GetOriginalProfile(); + if (!g_instance) + g_instance = [[self alloc] initWithProfile:profile]; + + // The code doesn't expect multiple profiles. Check that support for that + // hasn't been added. + DCHECK(g_instance->profile_ == profile); + + // Select desired tab. + if (settingsType == CONTENT_SETTINGS_TYPE_DEFAULT) { + // Remember the last visited page from local state. + int value = g_instance->lastSelectedTab_.GetValue(); + if (value >= 0 && value < CONTENT_SETTINGS_NUM_TYPES) + settingsType = static_cast<ContentSettingsType>(value); + if (settingsType == CONTENT_SETTINGS_TYPE_DEFAULT) + settingsType = CONTENT_SETTINGS_TYPE_COOKIES; + } + // TODO(thakis): Actually select desired tab. + + [g_instance showWindow:nil]; + return g_instance; +} + +- (id)initWithProfile:(Profile*)profile { + DCHECK(profile); + NSString* nibpath = + [mac_util::MainAppBundle() pathForResource:@"ContentSettings" + ofType:@"nib"]; + if ((self = [super initWithWindowNibPath:nibpath owner:self])) { + profile_ = profile; + + // We don't need to observe changes in this value. + lastSelectedTab_.Init(prefs::kContentSettingsWindowLastTabIndex, + profile->GetPrefs(), NULL); + } + return self; +} + +- (void)windowWillClose:(NSNotification*)notification { + [self autorelease]; + g_instance = nil; +} + +// Shows the cookies controller. +- (IBAction)showCookies:(id)sender { + // The cookie controller will autorelease itself when it's closed. + BrowsingDataDatabaseHelper* databaseHelper = + new BrowsingDataDatabaseHelper(profile_); + BrowsingDataLocalStorageHelper* storageHelper = + new BrowsingDataLocalStorageHelper(profile_); + CookiesWindowController* controller = + [[CookiesWindowController alloc] initWithProfile:profile_ + databaseHelper:databaseHelper + storageHelper:storageHelper]; + [controller attachSheetTo:[self window]]; +} + +@end diff --git a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm new file mode 100644 index 0000000..c2d36b5 --- /dev/null +++ b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm @@ -0,0 +1,32 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "chrome/browser/cocoa/content_settings_dialog_controller.h" + +#include "base/scoped_nsautorelease_pool.h" +#include "chrome/browser/cocoa/browser_test_helper.h" +#include "chrome/browser/cocoa/cocoa_test_helper.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "testing/platform_test.h" + +namespace { + +class ContentSettingsDialogControllerTest : public CocoaTest { + public: + BrowserTestHelper browser_helper_; +}; + +// Test that +showContentSettingsDialogForProfile brings up the existing editor +// and doesn't leak or crash. +TEST_F(ContentSettingsDialogControllerTest, CreateDialog) { + Profile* profile(browser_helper_.profile()); + ContentSettingsDialogController* sharedInstance = + [ContentSettingsDialogController + showContentSettingsForType:CONTENT_SETTINGS_TYPE_DEFAULT + profile:profile]; + EXPECT_TRUE(sharedInstance); + [sharedInstance close]; +} + +} // namespace diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h index 0fd7d5c..f349ac3 100644 --- a/chrome/browser/cocoa/preferences_window_controller.h +++ b/chrome/browser/cocoa/preferences_window_controller.h @@ -10,7 +10,6 @@ #include "chrome/browser/pref_member.h" class PersonalDataManagerObserver; -@class CookiesWindowController; @class CustomHomePagesModel; @class FontLanguageSettingsController; class PrefObserverBridge; @@ -94,12 +93,13 @@ class ProfileSyncService; // Under the hood panel IBOutlet NSView* underTheHoodContentView_; IBOutlet NSScrollView* underTheHoodScroller_; + IBOutlet NSButton* contentSettingsButton_; + IBOutlet NSButton* clearDataButton_; BooleanPrefMember alternateErrorPages_; BooleanPrefMember useSuggest_; BooleanPrefMember dnsPrefetch_; BooleanPrefMember safeBrowsing_; BooleanPrefMember metricsRecording_; - IntegerPrefMember cookieBehavior_; IBOutlet NSPathControl* downloadLocationControl_; IBOutlet NSButton* downloadLocationButton_; StringPrefMember defaultDownloadLocation_; @@ -131,15 +131,15 @@ class ProfileSyncService; - (IBAction)showSavedPasswords:(id)sender; - (IBAction)showAutoFillSettings:(id)sender; - (IBAction)importData:(id)sender; -- (IBAction)clearData:(id)sender; - (IBAction)resetThemeToDefault:(id)sender; - (IBAction)themesGallery:(id)sender; - (IBAction)doSyncAction:(id)sender; - (IBAction)doSyncReauthentication:(id)sender; // Under the hood -- (IBAction)showCookies:(id)sender; - (IBAction)browseDownloadLocation:(id)sender; +- (IBAction)clearData:(id)sender; +- (IBAction)showContentSettings:(id)sender; - (IBAction)privacyLearnMore:(id)sender; - (IBAction)changeFontAndLanguageSettings:(id)sender; - (IBAction)showCertificates:(id)sender; diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index af59f2d..59181ad 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -5,6 +5,7 @@ #import "chrome/browser/cocoa/preferences_window_controller.h" #include <algorithm> + #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/logging.h" @@ -19,7 +20,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/cocoa/clear_browsing_data_controller.h" -#import "chrome/browser/cocoa/cookies_window_controller.h" +#import "chrome/browser/cocoa/content_settings_dialog_controller.h" #import "chrome/browser/cocoa/custom_home_pages_model.h" #import "chrome/browser/cocoa/font_language_settings_controller.h" #import "chrome/browser/cocoa/import_settings_dialog.h" @@ -311,8 +312,12 @@ void RemoveGroupFromView(NSView* view, NSArray* toRemove) { // Helper to tweak the layout of the "Under the Hood" content by autosizing all // the views and moving things up vertically. Special case the two controls for -// download location as they are horizontal, and should fill the row. +// download location as they are horizontal, and should fill the row. Special +// case "Content Settings" and "Clear browsing data" as they are horizontal as +// well. CGFloat AutoSizeUnderTheHoodContent(NSView* view, + NSButton* contentSettingsButton, + NSButton* clearDataButton, NSPathControl* downloadLocationControl, NSButton* downloadLocationButton) { CGFloat verticalShift = 0.0; @@ -330,6 +335,13 @@ CGFloat AutoSizeUnderTheHoodContent(NSView* view, } verticalShift += delta.height; + // "Content Settings" and "Clear Browsing Data" are horizontally aligned. + if (view == contentSettingsButton) { + NSPoint origin = [clearDataButton frame].origin; + origin.x += delta.width; + [clearDataButton setFrameOrigin:origin]; + } + // The Download Location controls go in a row with the button aligned to the // right edge and the path control using all the rest of the space. if (view == downloadLocationButton) { @@ -377,7 +389,6 @@ CGFloat AutoSizeUnderTheHoodContent(NSView* view, - (void)setDnsPrefetch:(BOOL)value; - (void)setSafeBrowsing:(BOOL)value; - (void)setMetricsRecording:(BOOL)value; -- (void)setCookieBehavior:(NSInteger)value; - (void)setAskForSaveLocation:(BOOL)value; - (void)displayPreferenceViewForPage:(OptionsPage)page animate:(BOOL)animate; @@ -716,6 +727,8 @@ void PersonalDataManagerObserver::ShowAutoFillDialog( // Now that Under the Hood is the right width, auto-size to the new width to // get the final height. verticalShift = AutoSizeUnderTheHoodContent(underTheHoodContentView_, + contentSettingsButton_, + clearDataButton_, downloadLocationControl_, downloadLocationButton_); [GTMUILocalizerAndLayoutTweaker @@ -791,7 +804,6 @@ void PersonalDataManagerObserver::ShowAutoFillDialog( local = prefs_; metricsRecording_.Init(prefs::kMetricsReportingEnabled, local, observer_.get()); - cookieBehavior_.Init(prefs::kCookieBehavior, prefs_, observer_.get()); defaultDownloadLocation_.Init(prefs::kDownloadDefaultDirectory, prefs_, observer_.get()); askForSaveLocation_.Init(prefs::kPromptForDownload, prefs_, observer_.get()); @@ -1256,13 +1268,6 @@ const int kDisabledIndex = 1; [ImportSettingsDialogController showImportSettingsDialogForProfile:profile_]; } -// Called to clear user's browsing data. This puts up an application-modal -// dialog to guide the user through clearing the data. -- (IBAction)clearData:(id)sender { - [ClearBrowsingDataController - showClearBrowsingDialogForProfile:profile_]; -} - - (IBAction)resetThemeToDefault:(id)sender { [self recordUserAction:"Options_ThemesReset"]; profile_->ClearTheme(); @@ -1394,9 +1399,6 @@ const int kDisabledIndex = 1; else if (*prefName == prefs::kMetricsReportingEnabled) { [self setMetricsRecording:metricsRecording_.GetValue() ? YES : NO]; } - else if (*prefName == prefs::kCookieBehavior) { - [self setCookieBehavior:cookieBehavior_.GetValue()]; - } else if (*prefName == prefs::kPromptForDownload) { [self setAskForSaveLocation:askForSaveLocation_.GetValue() ? YES : NO]; } @@ -1415,20 +1417,6 @@ const int kDisabledIndex = 1; } } -// Shows the cookies controller. -- (IBAction)showCookies:(id)sender { - // The controller will clean itself up. - BrowsingDataDatabaseHelper* databaseHelper = - new BrowsingDataDatabaseHelper(profile_); - BrowsingDataLocalStorageHelper* storageHelper = - new BrowsingDataLocalStorageHelper(profile_); - CookiesWindowController* controller = - [[CookiesWindowController alloc] initWithProfile:profile_ - databaseHelper:databaseHelper - storageHelper:storageHelper]; - [controller attachSheetTo:[self window]]; -} - // Bring up an open panel to allow the user to set a new downloads location. - (void)browseDownloadLocation:(id)sender { NSOpenPanel* panel = [NSOpenPanel openPanel]; @@ -1445,6 +1433,20 @@ const int kDisabledIndex = 1; contextInfo:NULL]; } +// Called to clear user's browsing data. This puts up an application-modal +// dialog to guide the user through clearing the data. +- (IBAction)clearData:(id)sender { + [ClearBrowsingDataController + showClearBrowsingDialogForProfile:profile_]; +} + +// Opens the "Content Settings" dialog. +- (IBAction)showContentSettings:(id)sender { + [ContentSettingsDialogController + showContentSettingsForType:CONTENT_SETTINGS_TYPE_DEFAULT + profile:profile_]; +} + - (IBAction)privacyLearnMore:(id)sender { // We open a new browser window so the Options dialog doesn't get lost // behind other windows. @@ -1564,17 +1566,6 @@ const int kDisabledIndex = 1; metricsRecording_.SetValue(enabled); } -// Returns the index of the cookie popup based on the preference. -- (NSInteger)cookieBehavior { - return cookieBehavior_.GetValue(); -} - -// Sets the backend pref for whether or not to accept cookies based on |index|. -- (void)setCookieBehavior:(NSInteger)index { - // TODO(darin): Remove everything else related to this setter. - // http://crbug.com/34656 -} - - (NSURL*)defaultDownloadLocation { NSString* pathString = base::SysWideToNSString(defaultDownloadLocation_.GetValue()); diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 04bd906..ef011ca 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -473,6 +473,8 @@ 'browser/cocoa/constrained_window_mac.mm', 'browser/cocoa/content_blocked_bubble_controller.h', 'browser/cocoa/content_blocked_bubble_controller.mm', + 'browser/cocoa/content_settings_dialog_controller.h', + 'browser/cocoa/content_settings_dialog_controller.mm', 'browser/cocoa/cookie_tree_node.h', 'browser/cocoa/cookie_tree_node.mm', 'browser/cocoa/cookies_window_controller.h', @@ -2358,6 +2360,7 @@ 'app/nibs/ContentBlockedJavaScript.xib', 'app/nibs/ContentBlockedPlugins.xib', 'app/nibs/ContentBlockedPopups.xib', + 'app/nibs/ContentSettings.xib', 'app/nibs/DownloadItem.xib', 'app/nibs/DownloadShelf.xib', 'app/nibs/EditSearchEngine.xib', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 68339e0..d900130 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -196,6 +196,7 @@ 'app/nibs/ContentBlockedJavaScript.xib', 'app/nibs/ContentBlockedPlugins.xib', 'app/nibs/ContentBlockedPopups.xib', + 'app/nibs/ContentSettings.xib', 'app/nibs/DownloadItem.xib', 'app/nibs/DownloadShelf.xib', 'app/nibs/EditSearchEngine.xib', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 346bae7..9e5d95d 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -610,6 +610,7 @@ 'browser/cocoa/cocoa_test_helper.mm', 'browser/cocoa/command_observer_bridge_unittest.mm', 'browser/cocoa/content_blocked_bubble_controller_unittest.mm', + 'browser/cocoa/content_settings_dialog_controller_unittest.mm', 'browser/cocoa/cookies_window_controller_unittest.mm', 'browser/cocoa/custom_home_pages_model_unittest.mm', 'browser/cocoa/delayedmenu_button_unittest.mm', |