diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 07:11:23 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 07:11:23 +0000 |
| commit | b9a4ea7fbdc54868b60d50bc5fade451718dec23 (patch) | |
| tree | 952098c43264b79a6b196af301d2ca51232a3e33 /chrome/app | |
| parent | 4930760d08e0d3afef5e99684fc7450b15d0cf78 (diff) | |
| download | chromium_src-b9a4ea7fbdc54868b60d50bc5fade451718dec23.zip chromium_src-b9a4ea7fbdc54868b60d50bc5fade451718dec23.tar.gz chromium_src-b9a4ea7fbdc54868b60d50bc5fade451718dec23.tar.bz2 | |
Allow content setting changes in incognito mode.
This removes the logic to disable the "remeber" functions in the UI elements (basically reverting r44084, but leaves the incognito host content setting map in place. Changes to this map are allowed but do not get stored in preferences.
BUG=44480
TEST=none
Review URL: http://codereview.chromium.org/2811025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/nibs/CookiePrompt.xib | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/app/nibs/CookiePrompt.xib b/chrome/app/nibs/CookiePrompt.xib index afb028f..233d8f2 100644 --- a/chrome/app/nibs/CookiePrompt.xib +++ b/chrome/app/nibs/CookiePrompt.xib @@ -562,14 +562,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">160</int> </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">askChoiceCell_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="969084885"/> - </object> - <int key="connectionID">161</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -857,7 +849,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">161</int> + <int key="maxID">160</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -892,7 +884,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>askChoiceCell_</string> <string>description_</string> <string>disclosedViewPlaceholder_</string> <string>disclosureButtonSuperView_</string> @@ -902,7 +893,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSButtonCell</string> <string>NSTextField</string> <string>NSView</string> <string>NSView</string> |