summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 12:01:19 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 12:01:19 +0000
commita405e719937d116393de80046ed520a06364bc2a (patch)
tree5d639c0389ba59a43af31cee00d5a3b90ae1a1c4 /chrome
parent5f2faeab17c40d1ee10ad1e94140369213992968 (diff)
downloadchromium_src-a405e719937d116393de80046ed520a06364bc2a.zip
chromium_src-a405e719937d116393de80046ed520a06364bc2a.tar.gz
chromium_src-a405e719937d116393de80046ed520a06364bc2a.tar.bz2
Command line flag to disable the cookie prompt.
The XIB change re-introduces the cookie tab view item with the "ask" setting as additinoal tab view item. The controller deletes the one not required according to the command line flag. BUG=50083 TEST=none Review URL: http://codereview.chromium.org/3075013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/nibs/ContentBlockedCookies.xib27
-rw-r--r--chrome/app/nibs/ContentSettings.xib754
-rw-r--r--chrome/browser/cocoa/content_blocked_bubble_controller.h3
-rw-r--r--chrome/browser/cocoa/content_blocked_bubble_controller.mm18
-rw-r--r--chrome/browser/cocoa/content_exceptions_window_controller.h3
-rw-r--r--chrome/browser/cocoa/content_exceptions_window_controller.mm26
-rw-r--r--chrome/browser/cocoa/content_settings_dialog_controller.h4
-rw-r--r--chrome/browser/cocoa/content_settings_dialog_controller.mm19
-rw-r--r--chrome/browser/content_exceptions_table_model.cc2
-rw-r--r--chrome/browser/content_setting_bubble_model.cc6
-rw-r--r--chrome/browser/content_setting_bubble_model_unittest.cc3
-rw-r--r--chrome/browser/content_setting_combo_model.cc30
-rw-r--r--chrome/browser/content_setting_combo_model.h2
-rw-r--r--chrome/browser/gtk/options/cookie_filter_page_gtk.cc22
-rw-r--r--chrome/browser/gtk/options/cookie_filter_page_gtk.h1
-rw-r--r--chrome/browser/host_content_settings_map.cc12
-rw-r--r--chrome/browser/views/options/content_filter_page_view.cc24
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
19 files changed, 913 insertions, 47 deletions
diff --git a/chrome/app/nibs/ContentBlockedCookies.xib b/chrome/app/nibs/ContentBlockedCookies.xib
index ad4a976..63ff638 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="4"/>
+ <integer value="43"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -323,6 +323,14 @@
</object>
<int key="connectionID">46</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">infoButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="841670204"/>
+ </object>
+ <int key="connectionID">47</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -516,9 +524,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{565, 582}, {316, 114}}</string>
+ <string>{{414, 598}, {316, 114}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{565, 582}, {316, 114}}</string>
+ <string>{{414, 598}, {316, 114}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -557,7 +565,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">46</int>
+ <int key="maxID">47</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -599,7 +607,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>allowBlockToggled:</string>
<string>closeBubble:</string>
- <string>loadAllPlugins:</string>
<string>manageBlocking:</string>
<string>showMoreInfo:</string>
</object>
@@ -609,7 +616,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -619,6 +625,7 @@
<string>allowBlockRadioGroup_</string>
<string>contentsContainer_</string>
<string>doneButton_</string>
+ <string>infoButton_</string>
<string>manageButton_</string>
<string>titleLabel_</string>
</object>
@@ -628,6 +635,7 @@
<string>NSView</string>
<string>NSButton</string>
<string>NSButton</string>
+ <string>NSButton</string>
<string>NSTextField</string>
</object>
</object>
@@ -747,6 +755,13 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/view_id_util.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
diff --git a/chrome/app/nibs/ContentSettings.xib b/chrome/app/nibs/ContentSettings.xib
index 69f3196..0f7a00a 100644
--- a/chrome/app/nibs/ContentSettings.xib
+++ b/chrome/app/nibs/ContentSettings.xib
@@ -212,10 +212,10 @@
<object class="NSMatrix" id="924450148">
<reference key="NSNextResponder" ref="701201796"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{20, 294}, {497, 38}}</string>
+ <string key="NSFrame">{{20, 274}, {497, 58}}</string>
<reference key="NSSuperview" ref="701201796"/>
<bool key="NSEnabled">YES</bool>
- <int key="NSNumRows">2</int>
+ <int key="NSNumRows">3</int>
<int key="NSNumCols">1</int>
<object class="NSMutableArray" key="NSCells">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -243,7 +243,7 @@
<object class="NSButtonCell" id="246732046">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_COOKIES_BLOCK_RADIO</string>
+ <string key="NSContents">^IDS_COOKIES_ASK_EVERY_TIME_RADIO</string>
<reference key="NSSupport" ref="793851927"/>
<reference key="NSControlView" ref="924450148"/>
<int key="NSButtonFlags">1211912703</int>
@@ -348,6 +348,132 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
+ <object class="NSButtonCell" id="630144111">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_COOKIES_BLOCK_RADIO</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="924450148"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <object class="NSImage" key="NSNormalImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{18, 18}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="8"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">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
+AAAAAGAAAAA1xAAABypYWVogAAAAAAAAb5EAALNjAAAY8lhZWiAAAAAAAAAnRAAAFvMAALMJWFlaIAAA
+AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
+cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
+AQAAAgAAACkAkAEgAboCdgNQBEUFYQaUB90JQQq6DDkNwQ9XEOgSdhP+FXkW5hhKGZsa5BwVHTYeWh95
+IJghuCLZI/8lIiZGJ2ookCm7KuUsEC1DLnIvpTDbMg8zSTSFNcQ3ADhFOYM6vzvrPRE+Oj9aQHtBoELF
+Q+ZFCkYuR1FIcUmSSrZL2Ez7ThxPOlBZUX1SnFO7VNpV+lcdWERZb1qiW9RdBV40X2RgkWHBYvJkImVV
+Zo9nxGj9ajtrf2y+bgVvT3Cdce5zQ3SVdfB3QHhieWx6cnt5fIN9hn6Lf4qAjIGHgn2DeIRohVWGQocp
+iA2I7InHiqGLdYxKjRqN546zj4CQVpEtkgSS25OylIiVXpYylweX3ZizmYmaYZs4nA+c553BnpyfeKBV
+oTSiFKL1o9WkuKWMplanI6fyqMCpjapcqyur+KzHrZiuaK86sAqw2rGssn2zTrQgtPK1xbaUt2O4M7kD
+udC6kLtNvAi8xL2CvkC+/7++wHzBPcIAwsLDhcRMxRPF28alx3HIPckLydvKrcuAzFPNJc30zr7PiNBR
+0RnR4tKu03fUP9UK1dXWoNds2DnZB9nV2qTbdNxE3RXd6d6634/gY+E24g3i6uPC5JXlZeYx5vvnyeiU
+6WPqNusN6+js0e3G7sbv2PD/8kLzmfUK9qT4XPpG/GX+kv//AAAAQQDkAXECFwLTA7cEsAXHBvcIPQmV
+CwYMdQ30D30RABKCE/4VbhbPGCoZeBq3G+YdBh4oH0ggZCGBIqEjxSTkJgYnKChGKW8qkyu4LOMuDi83
+MGQxjjK+M/A1JDZTN4o4vDnrOwg8HT01Pkg/WEBuQYNClkOqRL1Fz0bhR/JJBkoYSylMOk1JTldPalB3
+UYRSklOhVLFVxlbiWAJZI1pDW2FcgV2fXr5f32D/YiFjSmRvZZdmw2f0aSJqVWuNbMZuA29DcH5xxHL8
+dBV1HHYfdyN4J3koeih7J3wmfSJ+Gn8TgAmA/IHugt6DzYS4hZ+GiodtiFOJNooXiveL04yrjYWOW48z
+kAyQ5pHAkpqTcpRQlS2WDJbsl8yYrpmPmnWbW5xDnSueFp8Cn+6g2qHGoqKjbaQ9pRCl46a1p4yoYKk1
+qg2q5au+rJqtcq5LryWv/7DZsbCyirNjtDi1DLXgtrS3iLheuTO6BrrYu6y8f71TviW+97/KwJ3BbsJA
+wxTD58S5xY3GYcc1yArI38m1yo3LZMw/zSTOE88Dz/LQ3dHI0rTTnNSD1WrWUtc52B/ZB9nv2tjbwtyv
+3Zvei9994G/hZeJb41LkS+VG5kTnQeg/6UPqSutS7Fztau5674/wqPHA8trz9/Ua9jz3X/iD+av60vv3
+/R7+P/9B//8AAAAbAF4AwwE2Aa4CPgLkA5oEYwU+BioHHAgZCRoKIgskDCwNKw4kDxIP+xDaEa4SdhM4
+E/kUtRVyFjAW7xevGG4ZLhnwGrMbdhw7HQEdzB6WH2EgLyD7IcwinyNyJEUlHiXzJsEnhCg+KPoptCpu
+Kysr6CymLWYuJi7nL6gwajExMfUyujOANEY1CzXUNps3YTgoOPA5uDp/O0Y8EDzaPaQ+bj83QAFAzEGX
+QmNDMEQARM5FnUZvR0RIFEjoSb1KlEtrTERNG030TslPlVBcUSNR7FK2U4JUUVUeVfBWwleWWG9ZRloh
+Wv9b31zAXaFeg19pYExhNWIbYwFj6GTKZahmhmdhaEBpH2n/auBrwWyhbYZua29PcDdxHnIGcu5z13TC
+dax2mHeEeHF5X3pJezF8AXzEfYN+RX8Df8CAf4E4gfKCrINnhCKE3YWYhlOHD4fNiIyJSooLis6LkIxS
+jReN3I6hj1qQE5DLkYSSQZMAk8GUhJVJlhKW35eumH+ZWZozmxCb8JzUnbqeo5+PoH2hb6Jho06kMqUQ
+peqmxaehqH6pX6o/qyCsA6zprc6us6+esIexcLJbs0W0MLUbtga28LfcuMW5rrqeu8C85L4BvxnAM8FT
+wnnDqMTixirHf8jsynDMB82/z6TRtNP31nnZWtye4JPlTuuk9Ur//wAAbmRpbgAAAAAAAAY2AACZAgAA
+VsgAAFUEAACRsAAAJ5EAABVgAABQDQAAVDkAAgo9AAH64QABJmYAAwEAAAIAAAATACwARQBfAHgAkQCr
+AMUA3wD5ARQBMAFMAWoBhwGmAcYB5wIKAi4CVAJ8AqcC0wMDAzUDagOlA+QEJARnBKwE8wU7BYUFzwYc
+BmoGugcMB10HsAgFCFsIsAkICWEJugoUCnEKzQsqC4cL5gxHDKYNCQ1sDdUORA61DyYPnBAUEIsRBBF/
+Ef0SehL6E3sT/xSFFQoVkRYbFqUXMhfCGFMY4hl2Ggsaohs6G9McbB0EHZweMR7HH2Af+iCXITQh1CJ0
+IxQjtiRaJP0lnSZCJucniyguKM8pdSoZKrsrXiwALKItRC3mLosvLC/OMHoxRDIdMvkz1zSzNZg2ezdn
+OFE5Qzo9OzM8Nj0/Pko/YEB7QaJCzEQCRTlGfkfISRJKUUuQTNROGU9iUK1R/lNPVKFV91dKWKNZ/VtV
+XK1eBl9fYLdiD2NsZMNmN2fBaUJqyGxTbdpvaXD4coV0FXWldzx40XpqfAN9oH87gOGCiYQyheCHsYmP
+i3ONUo8zkRSS+5Talr2Ynpp4nFeeMKAIod+jtKWGp1apKasHrPKu47DYstK0xLbCuL+6uby4vrXAssKv
+xK3GqsipyqHMo86c0J7SndSK1ofYktqs3NLe7+EZ4zPlQudH6TDq/+y77lvv4fFL8qbz8PUp9kr3Yvhu
++Wj6V/s2/BD83v2k/pf//wAAAAwAIwA8AFQAbgCHAKEAuwDWAPEBDAEpAUYBZAGCAaIBwwHlAgkCLgJV
+An8CqwLZAwkDPQN0A7AD8AQxBHQEugUCBUsFlQXgBi8GfgbPByMHdQfKCCIIeQjRCSsJhwnjCkIKoQsA
+C2ELwgwnDIoM8A1YDcMOOA6wDygPpBAjEKERIRGkEigSrhM2E8AUTBTaFWgV+RaMFyEXuRhTGOsZiRoo
+GskbaxwOHLEdUh3xHpAfMR/UIHkhHyHHInAjGiPFJHIlHiXIJnYnJCfSKH0pKinaKocrMyvgLIwtOS3l
+LpYvQS/wMK0xgTJeMz40HzUBNek20Te+OKs5oDqYO5A8kT2TPps/pUC1Qc5C5EQFRSRGTEd3SKZJ40se
+TGJNo07mUCtRcVK9VAFVSlaRV9pZIlpuW7Rc/F5EX4xg02IZY2VkrGYSZ5lpFGqQbBFtjG8OcI5yDHOM
+dQl2j3gUeZt7I3y0fkB/04FwgxCEsoZVh/eJoItPjPyOrZBgkhqT0ZWMl06ZDJrMnJOeVqAcoeSjrKV0
+pzqpBarCrGOuAq+nsVKzArSvtmm4Jbnhu5+9ZL8kwOjCqsRuxivH78moy2PNHc7S0IvSQNP31abXV9kM
+2rncYN4F363hT+Lt5IrmIOey6Urq3+xw7fvviPEW8qX0MPW490f41vpk+/39jv//AAAAHQBEAGoAkQC4
+AN8BCAEyAV4BiwG8Ae4CJAJeAp4C4gMsA38D3AQ+BKYFEgWBBfMGagbjB18H3ghgCOEJZwnuCnkLAwuP
+DCAMrw1DDeEOkg9FD/4QuBF0EjMS9BO3FH4VQxYNFtgXqBh6GUwaJRr/G9scuh2fHoIfaCBRIT4iLSMd
+JBElBSX4JvEn6SjfKd0q1yvULNEtzy7SL9Mw5DIEMyc0SDVrNos3rzjOOfI7DjwvPU0+aT+FQKJBwkLd
+Q/5FGkY9R2BIhUm4Su1MKU1hTppP1VEQUlFTjFTJVglXRFiFWcZbCFxJXYxe0GAVYVpioGPuZUJm0Why
+ag9rvG1mbx9w2XKUdFJ2FHfZeZx7XH0ift6AoYJkhCSF5ofHibCLm417j1iRMJMGlM6WlZhWmgebup1n
+nw6gsqJSo++liKceqLSqWawVrd6vqLF0sz21ALbJuI+6ULwSvdi/lMFXwxjE2saeyGXKKMv0zbvPi9Fe
+0yLUlNYJ14nZE9qe3CTdo98b4Ivh8eNM5J3l4+cY6EDpYup764Pshe1y7l3vN/AP8Nfxn/JX8w7zu/RY
+9Pb1i/YX9qP3KPec+A/4g/jx+VL5tPoW+nj6yvsT+1z7pfvu/Df8dvym/NX9Bf00/WT9k/3D/fP+Iv5P
+/nr+pf7Q/vv/J/9S/33/qP/U//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABtbHVjAAAAAAAAABIAAAAMbmJOTwAAABIAAADocHRQVAAAABYAAAD6c3ZTRQAAABAAAAEQZmlGSQAA
+ABAAAAEgZGFESwAAABwAAAEwemhDTgAAAAwAAAFMZnJGUgAAABIAAAFYamFKUAAAAA4AAAFqZW5VUwAA
+ABIAAAF4cGxQTAAAABIAAAGKcHRCUgAAABgAAAGcZXNFUwAAABIAAAG0emhUVwAAAA4AAAHGcnVSVQAA
+ACQAAAHUa29LUgAAAAwAAAH4ZGVERQAAABAAAAIEbmxOTAAAABYAAAIUaXRJVAAAABQAAAIqAEYAYQBy
+AGcAZQAtAEwAQwBEAEwAQwBEACAAYQAgAEMAbwByAGUAcwBGAOQAcgBnAC0ATABDAEQAVgDkAHIAaQAt
+AEwAQwBEAEwAQwBEAC0AZgBhAHIAdgBlAHMAawDmAHIAbV9pgnIAIABMAEMARADJAGMAcgBhAG4AIABM
+AEMARDCrMOkw/AAgAEwAQwBEAEMAbwBsAG8AcgAgAEwAQwBEAEsAbwBsAG8AcgAgAEwAQwBEAEwAQwBE
+ACAAQwBvAGwAbwByAGkAZABvAEwAQwBEACAAYwBvAGwAbwByX2mCcm2yZnaYb3k6VmgEJgQyBDUEQgQ9
+BD4EOQAgBBYEGgAtBDQEOARBBD8EOwQ1BDnO7LfsACAATABDAEQARgBhAHIAYgAtAEwAQwBEAEsAbABl
+AHUAcgBlAG4ALQBMAEMARABMAEMARAAgAGMAbwBsAG8AcgBpAABtbW9kAAAAAAAABhAAAJyBAAAAAMG9
+/4AAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4sIDIwMTAAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <reference key="NSColor" ref="697400790"/>
+ </object>
+ <reference key="NSAlternateImage" ref="212721146"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
</object>
<string key="NSCellSize">{497, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
@@ -437,7 +563,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="375419183">
<reference key="NSNextResponder" ref="701201796"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{14, 258}, {274, 32}}</string>
+ <string key="NSFrame">{{14, 226}, {274, 32}}</string>
<reference key="NSSuperview" ref="701201796"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="973058887">
@@ -457,7 +583,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="490605964">
<reference key="NSNextResponder" ref="701201796"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{20, 127}, {217, 25}}</string>
+ <string key="NSFrame">{{20, 95}, {217, 25}}</string>
<reference key="NSSuperview" ref="701201796"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="682336992">
@@ -477,7 +603,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="255262147">
<reference key="NSNextResponder" ref="701201796"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{18, 230}, {501, 18}}</string>
+ <string key="NSFrame">{{18, 198}, {501, 18}}</string>
<reference key="NSSuperview" ref="701201796"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="269504348">
@@ -504,7 +630,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="927218761">
<reference key="NSNextResponder" ref="701201796"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{18, 210}, {501, 18}}</string>
+ <string key="NSFrame">{{18, 178}, {501, 18}}</string>
<reference key="NSSuperview" ref="701201796"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="508046139">
@@ -526,7 +652,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="905620757">
<reference key="NSNextResponder" ref="701201796"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{14, 164}, {296, 32}}</string>
+ <string key="NSFrame">{{14, 132}, {296, 32}}</string>
<reference key="NSSuperview" ref="701201796"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="645604930">
@@ -550,6 +676,333 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSColor" ref="542606114"/>
<reference key="NSTabView" ref="604468971"/>
</object>
+ <object class="NSTabViewItem" id="537236264">
+ <string key="NSIdentifier">1</string>
+ <object class="NSView" key="NSView" id="287887251">
+ <reference key="NSNextResponder" ref="604468971"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMatrix" id="584599051">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{20, 294}, {497, 38}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <int key="NSNumRows">2</int>
+ <int key="NSNumCols">1</int>
+ <object class="NSMutableArray" key="NSCells">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButtonCell" id="296011612">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_COOKIES_ALLOW_RADIO</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <int key="NSTag">1</int>
+ <reference key="NSControlView" ref="584599051"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <reference key="NSAlternateImage" ref="212721146"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <object class="NSButtonCell" id="1046245915">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_COOKIES_BLOCK_RADIO</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="584599051"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <object class="NSImage" key="NSNormalImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{18, 18}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="8"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">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
+AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA
+AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
+cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
+AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH
+SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF
+hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8
+vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt
+7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq
+Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo
+aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e
+n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX
+2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW
+FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O
+Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6
+ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt
+rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA
+AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA
+AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl
+A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq
+DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU
+HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8
+MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v
+UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/
+eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj
+rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn
+5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh
+AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK
+CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY
+GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95
+MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S
+UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2
+d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV
+pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK
+0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf//
+AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw
+BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA
+FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H
+LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh
+Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ
+h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp
+svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb
+1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX
+8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE
+AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg
+QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <reference key="NSColor" ref="697400790"/>
+ </object>
+ <reference key="NSAlternateImage" ref="212721146"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ </object>
+ <string key="NSCellSize">{497, 18}</string>
+ <string key="NSIntercellSpacing">{4, 2}</string>
+ <int key="NSMatrixFlags">1151868928</int>
+ <string key="NSCellClass">NSActionCell</string>
+ <object class="NSButtonCell" key="NSProtoCell" id="835416558">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Radio</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <object class="NSImage" key="NSNormalImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{18, 18}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="8"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <reference key="NSColor" ref="697400790"/>
+ </object>
+ <reference key="NSAlternateImage" ref="212721146"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <reference key="NSSelectedCell" ref="296011612"/>
+ <reference key="NSBackgroundColor" ref="542606114"/>
+ <reference key="NSCellBackgroundColor" ref="435607944"/>
+ <reference key="NSFont" ref="793851927"/>
+ </object>
+ <object class="NSTextField" id="542647555">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{17, 340}, {503, 17}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="888729930">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">272629760</int>
+ <string key="NSContents">^IDS_MODIFY_COOKIE_STORING_LABEL</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="542647555"/>
+ <reference key="NSBackgroundColor" ref="542606114"/>
+ <reference key="NSTextColor" ref="416143551"/>
+ </object>
+ </object>
+ <object class="NSButton" id="497467379">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{14, 246}, {274, 32}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="281015894">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_COOKIES_EXCEPTIONS_BUTTON</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="497467379"/>
+ <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="141495203">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{20, 115}, {217, 25}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="349127428">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_FLASH_STORAGE_SETTINGS</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="141495203"/>
+ <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 class="NSButton" id="573064076">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{18, 218}, {501, 18}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="267730344">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="573064076"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSNormalImage" ref="1054520235"/>
+ <reference key="NSAlternateImage" ref="269053493"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="292289709">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{18, 198}, {501, 18}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="241615184">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">^IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX</string>
+ <reference key="NSSupport" ref="793851927"/>
+ <reference key="NSControlView" ref="292289709"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSNormalImage" ref="1054520235"/>
+ <reference key="NSAlternateImage" ref="269053493"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="460805837">
+ <reference key="NSNextResponder" ref="287887251"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{14, 152}, {296, 32}}</string>
+ <reference key="NSSuperview" ref="287887251"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="709389105">
+ <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="460805837"/>
+ <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">{537, 377}</string>
+ <reference key="NSSuperview" ref="604468971"/>
+ </object>
+ <string key="NSLabel">^IDS_COOKIES_TAB_LABEL</string>
+ <reference key="NSColor" ref="542606114"/>
+ <reference key="NSTabView" ref="604468971"/>
+ </object>
<object class="NSTabViewItem" id="529512720">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="374820597">
@@ -1909,7 +2362,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="646198478">
<string key="NSIdentifier">6</string>
<object class="NSView" key="NSView" id="826885056">
- <reference key="NSNextResponder" ref="604468971"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2269,21 +2722,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrameSize">{537, 377}</string>
- <reference key="NSSuperview" ref="604468971"/>
</object>
<string key="NSLabel">^IDS_NOTIFICATIONS_TAB_LABEL</string>
<reference key="NSColor" ref="542606114"/>
<reference key="NSTabView" ref="604468971"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="646198478"/>
+ <reference key="NSSelectedTabViewItem" ref="537236264"/>
<reference key="NSFont" ref="793851927"/>
<int key="NSTvFlags">6</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="826885056"/>
+ <reference ref="287887251"/>
</object>
</object>
</object>
@@ -2628,6 +3080,90 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">180</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showCookies:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="460805837"/>
+ </object>
+ <int key="connectionID">200</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showCookieExceptions:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="497467379"/>
+ </object>
+ <int key="connectionID">201</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">openFlashPlayerSettings:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="141495203"/>
+ </object>
+ <int key="connectionID">202</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: blockThirdPartyCookies</string>
+ <reference key="source" ref="573064076"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="573064076"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: blockThirdPartyCookies</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">blockThirdPartyCookies</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
+ <reference key="NS.object.0" ref="6"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">205</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: clearSiteDataOnExit</string>
+ <reference key="source" ref="292289709"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="292289709"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: clearSiteDataOnExit</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">clearSiteDataOnExit</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
+ <reference key="NS.object.0" ref="6"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">209</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">selectedIndex: cookieSettingIndex</string>
+ <reference key="source" ref="584599051"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="584599051"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">selectedIndex: cookieSettingIndex</string>
+ <string key="NSBinding">selectedIndex</string>
+ <string key="NSKeyPath">cookieSettingIndex</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
+ <reference key="NS.object.0" ref="6"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">213</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2757,6 +3293,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="529512720"/>
<reference ref="284642839"/>
<reference ref="646198478"/>
+ <reference ref="537236264"/>
</object>
<reference key="parent" ref="905219760"/>
</object>
@@ -2822,10 +3359,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="90853615"/>
<reference ref="924450148"/>
<reference ref="375419183"/>
- <reference ref="490605964"/>
<reference ref="255262147"/>
<reference ref="927218761"/>
<reference ref="905620757"/>
+ <reference ref="490605964"/>
</object>
<reference key="parent" ref="284642839"/>
</object>
@@ -2888,6 +3425,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="924450148"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="630144111"/>
<reference ref="813458180"/>
<reference ref="246732046"/>
<reference ref="692643509"/>
@@ -2895,6 +3433,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="parent" ref="701201796"/>
</object>
<object class="IBObjectRecord">
+ <int key="objectID">33</int>
+ <reference key="object" ref="630144111"/>
+ <reference key="parent" ref="924450148"/>
+ </object>
+ <object class="IBObjectRecord">
<int key="objectID">32</int>
<reference key="object" ref="813458180"/>
<reference key="parent" ref="924450148"/>
@@ -3365,6 +3908,140 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="632781574"/>
<reference key="parent" ref="816280204"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">181</int>
+ <reference key="object" ref="537236264"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="287887251"/>
+ </object>
+ <reference key="parent" ref="604468971"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">182</int>
+ <reference key="object" ref="287887251"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="542647555"/>
+ <reference ref="584599051"/>
+ <reference ref="497467379"/>
+ <reference ref="141495203"/>
+ <reference ref="573064076"/>
+ <reference ref="292289709"/>
+ <reference ref="460805837"/>
+ </object>
+ <reference key="parent" ref="537236264"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">183</int>
+ <reference key="object" ref="141495203"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="349127428"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">184</int>
+ <reference key="object" ref="460805837"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="709389105"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">185</int>
+ <reference key="object" ref="292289709"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="241615184"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">186</int>
+ <reference key="object" ref="573064076"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="267730344"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">187</int>
+ <reference key="object" ref="497467379"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="281015894"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">188</int>
+ <reference key="object" ref="584599051"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="296011612"/>
+ <reference ref="1046245915"/>
+ <reference ref="835416558"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">189</int>
+ <reference key="object" ref="542647555"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="888729930"/>
+ </object>
+ <reference key="parent" ref="287887251"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">190</int>
+ <reference key="object" ref="888729930"/>
+ <reference key="parent" ref="542647555"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">191</int>
+ <reference key="object" ref="296011612"/>
+ <reference key="parent" ref="584599051"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">192</int>
+ <reference key="object" ref="1046245915"/>
+ <reference key="parent" ref="584599051"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">193</int>
+ <reference key="object" ref="835416558"/>
+ <reference key="parent" ref="584599051"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">195</int>
+ <reference key="object" ref="281015894"/>
+ <reference key="parent" ref="497467379"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">196</int>
+ <reference key="object" ref="267730344"/>
+ <reference key="parent" ref="573064076"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">197</int>
+ <reference key="object" ref="241615184"/>
+ <reference key="parent" ref="292289709"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">198</int>
+ <reference key="object" ref="709389105"/>
+ <reference key="parent" ref="460805837"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">199</int>
+ <reference key="object" ref="349127428"/>
+ <reference key="parent" ref="141495203"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3414,6 +4091,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>174.IBPluginDependency</string>
<string>175.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
+ <string>181.IBPluginDependency</string>
+ <string>182.IBPluginDependency</string>
+ <string>183.IBPluginDependency</string>
+ <string>184.IBPluginDependency</string>
+ <string>185.IBPluginDependency</string>
+ <string>186.IBPluginDependency</string>
+ <string>187.IBPluginDependency</string>
+ <string>188.IBPluginDependency</string>
+ <string>189.IBPluginDependency</string>
+ <string>190.IBPluginDependency</string>
+ <string>191.IBPluginDependency</string>
+ <string>192.IBPluginDependency</string>
+ <string>193.IBPluginDependency</string>
+ <string>195.IBPluginDependency</string>
+ <string>196.IBPluginDependency</string>
+ <string>197.IBPluginDependency</string>
+ <string>198.IBPluginDependency</string>
+ <string>199.CustomClassName</string>
+ <string>199.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
<string>25.IBPluginDependency</string>
<string>26.CustomClassName</string>
@@ -3470,9 +4166,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{250, 293}, {675, 377}}</string>
+ <string>{{141, 293}, {675, 377}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{250, 293}, {675, 377}}</string>
+ <string>{{141, 293}, {675, 377}}</string>
<reference ref="6"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -3519,6 +4215,25 @@ 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>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>
+ <string>HyperlinkButtonCell</string>
+ <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>
@@ -3589,7 +4304,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">180</int>
+ <int key="maxID">213</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3735,6 +4450,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/view_id_util.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.h b/chrome/browser/cocoa/content_blocked_bubble_controller.h
index 3d824cf..74b23ce 100644
--- a/chrome/browser/cocoa/content_blocked_bubble_controller.h
+++ b/chrome/browser/cocoa/content_blocked_bubble_controller.h
@@ -33,6 +33,9 @@ typedef std::map<NSButton*, int> PopupLinks;
// The container for the bubble contents of the geolocation bubble.
IBOutlet NSView* contentsContainer_;
+ // The info button of the cookies bubble.
+ IBOutlet NSButton* infoButton_;
+
scoped_ptr<ContentSettingBubbleModel> contentSettingBubbleModel_;
content_blocked_bubble::PopupLinks popupLinks_;
}
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
index b4c453b..519278a 100644
--- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm
+++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
@@ -5,6 +5,7 @@
#import "chrome/browser/cocoa/content_blocked_bubble_controller.h"
#include "app/l10n_util.h"
+#include "base/command_line.h"
#include "base/logging.h"
#include "base/sys_string_conversions.h"
#include "chrome/browser/blocked_popup_container.h"
@@ -14,6 +15,7 @@
#import "chrome/browser/cocoa/l10n_util.h"
#include "chrome/browser/content_setting_bubble_model.h"
#include "chrome/browser/host_content_settings_map.h"
+#include "chrome/common/chrome_switches.h"
#include "grit/generated_resources.h"
#include "skia/ext/skia_utils_mac.h"
#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
@@ -86,6 +88,7 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
- (void)initializePopupList;
- (void)initializeGeoLists;
- (void)sizeToFitManageDoneButtons;
+- (void)removeInfoButton;
- (void)popupLinkClicked:(id)sender;
- (void)clearGeolocationForCurrentHost:(id)sender;
@end
@@ -358,6 +361,18 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
[[self window] setFrame:frame display:NO];
}
+- (void)removeInfoButton {
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt)) {
+ // Remove info button and resize vertically.
+ int deltaY = NSHeight([infoButton_ frame]);
+ [infoButton_ removeFromSuperview];
+ NSRect frame = [[self window] frame];
+ frame.size.height -= deltaY;
+ [[self window] setFrame:frame display:NO];
+ }
+}
+
- (void)awakeFromNib {
[[self bubble] setBubbleType:info_bubble::kWhiteInfoBubble];
[[self bubble] setArrowLocation:info_bubble::kTopRight];
@@ -366,6 +381,9 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
[self sizeToFitManageDoneButtons];
[self initializeTitle];
+ if (contentSettingBubbleModel_->content_type() ==
+ CONTENT_SETTINGS_TYPE_COOKIES)
+ [self removeInfoButton];
if (allowBlockRadioGroup_) // not bound in cookie bubble xib
[self initializeRadioGroup];
if (contentSettingBubbleModel_->content_type() ==
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.h b/chrome/browser/cocoa/content_exceptions_window_controller.h
index 5c012f3..753fde0 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.h
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.h
@@ -34,6 +34,9 @@ class UpdatingContentSettingsObserver;
// Is set if "Session" should be a valid option in the "action" popup.
BOOL showSession_;
+ // Is set if the cookie prompt should be disabled.
+ BOOL disableCookiePrompt_;
+
// Is set if adding and editing exceptions for the current OTR session should
// be allowed.
BOOL otrAllowed_;
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.mm b/chrome/browser/cocoa/content_exceptions_window_controller.mm
index 86de896..5cc9529 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.mm
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.mm
@@ -6,10 +6,12 @@
#include "app/l10n_util_mac.h"
#include "app/table_model_observer.h"
+#include "base/command_line.h"
#import "base/mac_util.h"
#import "base/scoped_nsobject.h"
#include "base/sys_string_conversions.h"
#include "chrome/browser/content_exceptions_table_model.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/notification_service.h"
#include "grit/generated_resources.h"
@@ -132,6 +134,13 @@ const ContentSetting kSessionSettings[] = { CONTENT_SETTING_ALLOW,
CONTENT_SETTING_SESSION_ONLY,
CONTENT_SETTING_BLOCK };
+// The settings shown in the combobox if show_session_ is true, and we still
+// offer the cookie prompt mode.
+const ContentSetting kSessionAskSettings[] = { CONTENT_SETTING_ALLOW,
+ CONTENT_SETTING_ASK,
+ CONTENT_SETTING_SESSION_ONLY,
+ CONTENT_SETTING_BLOCK };
+
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -168,6 +177,8 @@ static ContentExceptionsWindowController*
model_.reset(new ContentExceptionsTableModel(
settingsMap_, otrSettingsMap_, settingsType_));
showSession_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
+ disableCookiePrompt_ = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt);
otrAllowed_ = otrSettingsMap != NULL;
tableObserver_.reset(new UpdatingContentSettingsObserver(self));
updatesEnabled_ = YES;
@@ -493,8 +504,12 @@ static ContentExceptionsWindowController*
}
- (size_t)menuItemCount {
- return showSession_ ?
- arraysize(kSessionSettings) : arraysize(kNoSessionSettings);
+ if (showSession_) {
+ return disableCookiePrompt_ ?
+ arraysize(kSessionSettings) : arraysize(kSessionAskSettings);
+ } else {
+ return arraysize(kNoSessionSettings);
+ }
}
- (NSString*)titleForIndex:(size_t)index {
@@ -513,7 +528,12 @@ static ContentExceptionsWindowController*
}
- (ContentSetting)settingForIndex:(size_t)index {
- return showSession_ ? kSessionSettings[index] : kNoSessionSettings[index];
+ if (showSession_) {
+ return disableCookiePrompt_ ?
+ kSessionSettings[index] : kSessionAskSettings[index];
+ } else {
+ return kNoSessionSettings[index];
+ }
}
- (size_t)indexForSetting:(ContentSetting)setting {
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.h b/chrome/browser/cocoa/content_settings_dialog_controller.h
index 3e1013b..11fd9f1 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.h
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.h
@@ -16,7 +16,8 @@ const NSInteger kContentSettingsDisabledIndex = 1;
// Indices of the various cookie settings in the cookie radio group.
const NSInteger kCookieEnabledIndex = 0;
-const NSInteger kCookieDisabledIndex = 1;
+const NSInteger kCookieAskIndex = 1;
+const NSInteger kCookieDisabledIndex = 2;
// Indices of the various geolocation settings in the geolocation radio group.
const NSInteger kGeolocationEnabledIndex = 0;
@@ -43,6 +44,7 @@ class Profile;
IBOutlet NSTabView* tabView_;
IBOutlet TabViewPickerTable* tabViewPicker_;
Profile* profile_; // weak
+ BOOL disableCookiePrompt_;
IntegerPrefMember lastSelectedTab_;
BooleanPrefMember clearSiteDataOnExit_;
scoped_ptr<ContentSettingsDialogControllerInternal::PrefObserverBridge>
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index d98948d..5949f09 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
#include "app/l10n_util.h"
+#include "base/command_line.h"
#include "base/mac_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
@@ -22,6 +23,7 @@
#import "chrome/browser/notifications/notification_exceptions_table_model.h"
#include "chrome/browser/pref_service.h"
#include "chrome/browser/profile.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -123,6 +125,8 @@ class PrefObserverDisabler {
- (id)initWithProfile:(Profile*)profile {
DCHECK(profile);
+ disableCookiePrompt_ = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt);
NSString* nibpath =
[mac_util::MainAppBundle() pathForResource:@"ContentSettings"
ofType:@"nib"];
@@ -174,6 +178,9 @@ class PrefObserverDisabler {
DCHECK(tabViewPicker_);
DCHECK_EQ(self, [[self window] delegate]);
+ [tabView_ removeTabViewItem:[tabView_
+ tabViewItemAtIndex:disableCookiePrompt_ ? 0 : 1]];
+
// Adapt views to potentially long localized strings.
CGFloat windowDelta = 0;
for (NSTabViewItem* tab in [tabView_ tabViewItems]) {
@@ -232,8 +239,13 @@ class PrefObserverDisabler {
- (void)setCookieSettingIndex:(NSInteger)value {
ContentSetting setting = CONTENT_SETTING_DEFAULT;
+ // If the cookie prompt is disabled, the radio button for "block" is at the
+ // position of the "ask" radio in the old dialog.
+ if (disableCookiePrompt_ && value == kCookieAskIndex)
+ value = kCookieDisabledIndex;
switch (value) {
case kCookieEnabledIndex: setting = CONTENT_SETTING_ALLOW; break;
+ case kCookieAskIndex: setting = CONTENT_SETTING_ASK; break;
case kCookieDisabledIndex: setting = CONTENT_SETTING_BLOCK; break;
default:
NOTREACHED();
@@ -249,7 +261,12 @@ class PrefObserverDisabler {
switch (profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
CONTENT_SETTINGS_TYPE_COOKIES)) {
case CONTENT_SETTING_ALLOW: return kCookieEnabledIndex;
- case CONTENT_SETTING_BLOCK: return kCookieDisabledIndex;
+ case CONTENT_SETTING_ASK: return kCookieAskIndex;
+ // If the cookie prompt is disabled, the radio button for "block" is at the
+ // position of the "ask" radio in the old dialog.
+ case CONTENT_SETTING_BLOCK: return disableCookiePrompt_ ?
+ kCookieAskIndex :
+ kCookieDisabledIndex;
default:
NOTREACHED();
return kCookieEnabledIndex;
diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc
index d149a6d..d7f1bb6 100644
--- a/chrome/browser/content_exceptions_table_model.cc
+++ b/chrome/browser/content_exceptions_table_model.cc
@@ -99,6 +99,8 @@ std::wstring ContentExceptionsTableModel::GetText(int row, int column_id) {
return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
case CONTENT_SETTING_BLOCK:
return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
+ case CONTENT_SETTING_ASK:
+ return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
case CONTENT_SETTING_SESSION_ONLY:
return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
default:
diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc
index 6d8b902..5c9c7e3 100644
--- a/chrome/browser/content_setting_bubble_model.cc
+++ b/chrome/browser/content_setting_bubble_model.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/content_setting_bubble_model.h"
#include "app/l10n_util.h"
+#include "base/command_line.h"
#include "chrome/browser/blocked_popup_container.h"
#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
#include "chrome/browser/host_content_settings_map.h"
@@ -12,6 +13,7 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
#include "grit/generated_resources.h"
@@ -73,7 +75,9 @@ class ContentSettingTitleLinkAndInfoModel
Profile* profile,
ContentSettingsType content_type)
: ContentSettingTitleAndLinkModel(tab_contents, profile, content_type) {
- SetInfoLink();
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt))
+ SetInfoLink();
}
private:
diff --git a/chrome/browser/content_setting_bubble_model_unittest.cc b/chrome/browser/content_setting_bubble_model_unittest.cc
index 5f96e49..42660dceb 100644
--- a/chrome/browser/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/content_setting_bubble_model_unittest.cc
@@ -72,7 +72,8 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
content_setting_bubble_model->bubble_content();
EXPECT_EQ(0U, bubble_content.radio_group.radio_items.size());
EXPECT_NE(std::string(), bubble_content.manage_link);
- EXPECT_NE(std::string(), bubble_content.info_link);
+ // The info link is disabled by default.
+ EXPECT_EQ(std::string(), bubble_content.info_link);
EXPECT_NE(std::string(), bubble_content.title);
}
diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc
index 678ea73..167693a 100644
--- a/chrome/browser/content_setting_combo_model.cc
+++ b/chrome/browser/content_setting_combo_model.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/content_setting_combo_model.h"
#include "app/l10n_util.h"
+#include "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
#include "grit/generated_resources.h"
namespace {
@@ -18,18 +20,31 @@ const ContentSetting kSessionSettings[] = { CONTENT_SETTING_ALLOW,
CONTENT_SETTING_SESSION_ONLY,
CONTENT_SETTING_BLOCK };
+// The settings shown in the combobox if show_session_ is true, and we still
+// offer the cookie prompt mode.
+const ContentSetting kSessionAskSettings[] = { CONTENT_SETTING_ALLOW,
+ CONTENT_SETTING_ASK,
+ CONTENT_SETTING_SESSION_ONLY,
+ CONTENT_SETTING_BLOCK };
+
} // namespace
ContentSettingComboModel::ContentSettingComboModel(bool show_session)
- : show_session_(show_session) {
+ : show_session_(show_session),
+ disable_cookie_prompt_(CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt)) {
}
ContentSettingComboModel::~ContentSettingComboModel() {
}
int ContentSettingComboModel::GetItemCount() {
- return show_session_ ?
- arraysize(kSessionSettings) : arraysize(kNoSessionSettings);
+ if (show_session_) {
+ return disable_cookie_prompt_ ?
+ arraysize(kSessionSettings) : arraysize(kSessionAskSettings);
+ } else {
+ return arraysize(kNoSessionSettings);
+ }
}
std::wstring ContentSettingComboModel::GetItemAt(int index) {
@@ -38,6 +53,8 @@ std::wstring ContentSettingComboModel::GetItemAt(int index) {
return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
case CONTENT_SETTING_BLOCK:
return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
+ case CONTENT_SETTING_ASK:
+ return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
case CONTENT_SETTING_SESSION_ONLY:
return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
default:
@@ -47,7 +64,12 @@ std::wstring ContentSettingComboModel::GetItemAt(int index) {
}
ContentSetting ContentSettingComboModel::SettingForIndex(int index) {
- return show_session_ ? kSessionSettings[index] : kNoSessionSettings[index];
+ if (show_session_) {
+ return disable_cookie_prompt_ ?
+ kSessionSettings[index] : kSessionAskSettings[index];
+ } else {
+ return kNoSessionSettings[index];
+ }
}
int ContentSettingComboModel::IndexForSetting(ContentSetting setting) {
diff --git a/chrome/browser/content_setting_combo_model.h b/chrome/browser/content_setting_combo_model.h
index d0edb0c..bb00acd 100644
--- a/chrome/browser/content_setting_combo_model.h
+++ b/chrome/browser/content_setting_combo_model.h
@@ -27,6 +27,8 @@ class ContentSettingComboModel : public ComboboxModel {
private:
const bool show_session_;
+ const bool disable_cookie_prompt_;
+
DISALLOW_COPY_AND_ASSIGN(ContentSettingComboModel);
};
diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
index 878fdd0..27afdcd 100644
--- a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
+++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/gtk/options/cookie_filter_page_gtk.h"
#include "app/l10n_util.h"
+#include "base/command_line.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browsing_data_local_storage_helper.h"
#include "chrome/browser/gtk/browser_window_gtk.h"
@@ -14,6 +15,7 @@
#include "chrome/browser/gtk/options/cookies_view.h"
#include "chrome/browser/host_content_settings_map.h"
#include "chrome/browser/profile.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
@@ -64,6 +66,9 @@ void CookieFilterPageGtk::HighlightGroup(OptionsGroup highlight_group) {
}
GtkWidget* CookieFilterPageGtk::InitCookieStoringGroup() {
+ bool disable_cookie_prompt = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt);
+
GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
allow_radio_ = gtk_radio_button_new_with_label(NULL,
@@ -72,6 +77,15 @@ GtkWidget* CookieFilterPageGtk::InitCookieStoringGroup() {
G_CALLBACK(OnCookiesAllowToggledThunk), this);
gtk_box_pack_start(GTK_BOX(vbox), allow_radio_, FALSE, FALSE, 0);
+ if (!disable_cookie_prompt) {
+ ask_every_time_radio_ = gtk_radio_button_new_with_label_from_widget(
+ GTK_RADIO_BUTTON(allow_radio_),
+ l10n_util::GetStringUTF8(IDS_COOKIES_ASK_EVERY_TIME_RADIO).c_str());
+ g_signal_connect(G_OBJECT(ask_every_time_radio_), "toggled",
+ G_CALLBACK(OnCookiesAllowToggledThunk), this);
+ gtk_box_pack_start(GTK_BOX(vbox), ask_every_time_radio_, FALSE, FALSE, 0);
+ }
+
block_radio_ = gtk_radio_button_new_with_label_from_widget(
GTK_RADIO_BUTTON(allow_radio_),
l10n_util::GetStringUTF8(IDS_COOKIES_BLOCK_RADIO).c_str());
@@ -89,9 +103,11 @@ GtkWidget* CookieFilterPageGtk::InitCookieStoringGroup() {
GtkWidget* radio_button = NULL;
if (default_setting == CONTENT_SETTING_ALLOW) {
radio_button = allow_radio_;
- } else {
- DCHECK(default_setting == CONTENT_SETTING_BLOCK);
+ } else if (default_setting == CONTENT_SETTING_BLOCK) {
radio_button = block_radio_;
+ } else {
+ DCHECK(default_setting == CONTENT_SETTING_ASK);
+ radio_button = ask_every_time_radio_;
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE);
@@ -148,6 +164,8 @@ void CookieFilterPageGtk::OnCookiesAllowToggled(GtkWidget* toggle_button) {
ContentSetting setting = CONTENT_SETTING_ALLOW;
if (toggle_button == allow_radio_)
setting = CONTENT_SETTING_ALLOW;
+ else if (toggle_button == ask_every_time_radio_)
+ setting = CONTENT_SETTING_ASK;
else if (toggle_button == block_radio_)
setting = CONTENT_SETTING_BLOCK;
diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.h b/chrome/browser/gtk/options/cookie_filter_page_gtk.h
index 8ab6804..ff65022 100644
--- a/chrome/browser/gtk/options/cookie_filter_page_gtk.h
+++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.h
@@ -44,6 +44,7 @@ class CookieFilterPageGtk : public OptionsPageBase {
// Widgets of the cookie storing group
GtkWidget* allow_radio_;
+ GtkWidget* ask_every_time_radio_;
GtkWidget* block_radio_;
GtkWidget* exceptions_button_;
diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc
index c08dacf..f09ac13 100644
--- a/chrome/browser/host_content_settings_map.cc
+++ b/chrome/browser/host_content_settings_map.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/host_content_settings_map.h"
+#include "base/command_line.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/chrome_thread.h"
@@ -13,6 +14,7 @@
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_source.h"
#include "chrome/common/notification_type.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "googleurl/src/gurl.h"
@@ -581,9 +583,13 @@ void HostContentSettingsMap::GetSettingsFromDictionary(
}
}
}
- // Migrate obsolete cookie prompt mode.
- if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] == CONTENT_SETTING_ASK)
- settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt)) {
+ // Migrate obsolete cookie prompt mode.
+ if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
+ CONTENT_SETTING_ASK)
+ settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;
+ }
}
void HostContentSettingsMap::ForceDefaultsToBeExplicit() {
diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc
index 299d6b3..0f3261e 100644
--- a/chrome/browser/views/options/content_filter_page_view.cc
+++ b/chrome/browser/views/options/content_filter_page_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/views/options/content_filter_page_view.h"
#include "app/l10n_util.h"
+#include "base/command_line.h"
#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
#include "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
@@ -12,6 +13,7 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/views/options/exceptions_view.h"
#include "chrome/browser/views/options/simple_content_exceptions_view.h"
+#include "chrome/common/chrome_switches.h"
#include "grit/generated_resources.h"
#include "views/controls/button/radio_button.h"
#include "views/grid_layout.h"
@@ -88,7 +90,7 @@ void ContentFilterPageView::InitControlLayout() {
layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
static const int kAskIDs[] = {
- 0,
+ IDS_COOKIES_ASK_EVERY_TIME_RADIO,
0,
0,
0,
@@ -100,14 +102,18 @@ void ContentFilterPageView::InitControlLayout() {
Need_a_setting_for_every_content_settings_type);
DCHECK_EQ(arraysize(kAskIDs),
static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
- if (kAskIDs[content_type_] != 0) {
- ask_radio_ = new views::RadioButton(
- l10n_util::GetString(kAskIDs[content_type_]), radio_button_group);
- ask_radio_->set_listener(this);
- ask_radio_->SetMultiLine(true);
- layout->StartRow(0, single_column_set_id);
- layout->AddView(ask_radio_);
- layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+ if (content_type_ != CONTENT_SETTINGS_TYPE_COOKIES ||
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableCookiePrompt)) {
+ if (kAskIDs[content_type_] != 0) {
+ ask_radio_ = new views::RadioButton(
+ l10n_util::GetString(kAskIDs[content_type_]), radio_button_group);
+ ask_radio_->set_listener(this);
+ ask_radio_->SetMultiLine(true);
+ layout->StartRow(0, single_column_set_id);
+ layout->AddView(ask_radio_);
+ layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+ }
}
static const int kBlockIDs[] = {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 3aadd0a..6016cda 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -123,6 +123,9 @@ const char kDisableBackingStoreLimit[] = "disable-backing-store-limit";
// Disable support for cached byte-ranges.
const char kDisableByteRangeSupport[] = "disable-byte-range-support";
+// Disables the cookie prompt.
+const char kDisableCookiePrompt[] = "disable-cookie-prompt";
+
// Disables the custom JumpList on Windows 7.
const char kDisableCustomJumpList[] = "disable-custom-jumplist";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index b0f3c28..e822cb5 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -49,6 +49,7 @@ extern const char kDisableAudio[];
extern const char kDisableAuthNegotiateCnameLookup[];
extern const char kDisableBackingStoreLimit[];
extern const char kDisableByteRangeSupport[];
+extern const char kDisableCookiePrompt[];
extern const char kDisableCustomJumpList[];
extern const char kDisableDatabases[];
extern const char kDisableDesktopNotifications[];
generated by cgit v1.1 at 2025-02-12 19:02:33 +0000