diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 17:44:07 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 17:44:07 +0000 |
| commit | ed98adaef63fac47daaca33181a176d675678d2b (patch) | |
| tree | dcbd4766f13b40d078f4a425420f0f685ba3796a /chrome/app | |
| parent | 461350dad530748c325f1d8bbcfb9344edc66767 (diff) | |
| download | chromium_src-ed98adaef63fac47daaca33181a176d675678d2b.zip chromium_src-ed98adaef63fac47daaca33181a176d675678d2b.tar.gz chromium_src-ed98adaef63fac47daaca33181a176d675678d2b.tar.bz2 | |
Support off the record content settings exceptions in DOM UI.
This adds the incognito exceptions in a separate table (ran this by ainslie). The second table will only show if an OTR session is active. This currently only works if you reopen the settings page after opening the OTR window (i.e. the settings page doesn't update as the OTR profile opens/closes, which actually matches the native dialogs).
BUG=48862
TEST=manual
Review URL: http://codereview.chromium.org/3398024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 208e42e..76c87d4 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4798,6 +4798,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_EXCEPTIONS_OTR_IN_ITALICS" desc="A label informing the user that incognito-only exceptions are displayed in italics"> Exceptions displayed in italics only apply to this incognito session. </message> + <message name="IDS_EXCEPTIONS_OTR_LABEL" desc="A label informing the user that the table below the label shows incognito-only exceptions"> + Exceptions below only apply to the current incognito session. + </message> <message name="IDS_EXCEPTIONS_NOT_SET_BUTTON" desc="A label to display in the exception page's action column when a site's content setting has not yet been set for a given domain."> Not set </message> |