diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 07:59:54 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 07:59:54 +0000 |
| commit | 5e134337567c56116e2940158dffba05e7733d4b (patch) | |
| tree | 52bba6544ad5d31a47791061b465fadfb593293f /chrome/app | |
| parent | 10c7ed8f076afd290fccf283d8bc416959722ca3 (diff) | |
| download | chromium_src-5e134337567c56116e2940158dffba05e7733d4b.zip chromium_src-5e134337567c56116e2940158dffba05e7733d4b.tar.gz chromium_src-5e134337567c56116e2940158dffba05e7733d4b.tar.bz2 | |
Change "session only" content settings to "clear on exit", and add code that migrates from the "clear on exit" checkbox to content settings
BUG=129349
TEST=HostContentSettingsMapTest.MigrateClearOnExit
Review URL: https://chromiumcodereview.appspot.com/10515005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6709b89..6315d81 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6660,7 +6660,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 Allow local data to be set (recommended) </message> <message name="IDS_COOKIES_SESSION_ONLY_RADIO" desc="A radio button in the Content Settings dialog for allowing cookies and other site data for the current session only."> - Allow local data to be set for the current session only + Keep local data only until I quit my browser </message> <message name="IDS_COOKIES_BLOCK_RADIO" desc="A radio button in the Content Settings dialog for blocking cookies and other site data from being stored on your computer."> Block sites from setting any data @@ -6871,7 +6871,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 Ask </message> <message name="IDS_EXCEPTIONS_SESSION_ONLY_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is allow but only for the duration of the session for a given domain."> - Session only + Clear on exit </message> <message name="IDS_EXCEPTIONS_BLOCK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is blocked for a given domain."> Block |