diff options
| author | miguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 17:44:45 +0000 |
|---|---|---|
| committer | miguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 17:44:45 +0000 |
| commit | ff3fb69d0827fad0a9c3092711f0f107bddf444c (patch) | |
| tree | b384ea62a58622546ed2e1bd9f78d83cb79d2940 /chrome/app | |
| parent | dfe07c3330bb0031fb12b3411ae4860d2318ee43 (diff) | |
| download | chromium_src-ff3fb69d0827fad0a9c3092711f0f107bddf444c.zip chromium_src-ff3fb69d0827fad0a9c3092711f0f107bddf444c.tar.gz chromium_src-ff3fb69d0827fad0a9c3092711f0f107bddf444c.tar.bz2 | |
Manual revert with a fix for the failing test.
Revert 279437 "Implement a permission check for push."
Suspect this is cause of test failure:
http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%283%29/builds/50906/steps/browser_tests/logs/Init
> Implement a permission check for push.
>
> Extracted common functionality from the midi permission check.
> A subsequent CL will move the common classes to chrome/browser/content_settings/
> and implement the midi permission check in terms of these classes.
>
> Note that bubbles are not yet implemented so only infobars work now.
> Note also that only way to rever the permission decision right now
> is to clear browser settings.
>
> Review URL: https://codereview.chromium.org/343743004
BUG=350378
TBR=bauerb,jam,fgorski,mvanouwerker
Review URL: https://codereview.chromium.org/352063003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 79b5f9f..41f6fb3 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -14485,6 +14485,23 @@ Do you accept? New version plus history string </message> + <!-- Push messaging strings --> + <message name="IDS_PUSH_MESSAGES_PERMISSION_QUESTION" desc="Question asked on the info bar whenever a domain wants to send push messages"> + <ph name="URL"> $1<ex>maps.google.com</ex> </ph> + wants to send you notifications. + </message> + <message name="IDS_PUSH_MESSAGES_TAB_LABEL" desc="Label for the push messages section on Content Settings dialog"> + Push Messages + </message> + <message name="IDS_PUSH_MESSSAGING_ALLOW_RADIO" desc="A radio button in Content Settings dialog to allow a site to send push messages."> + Allow all sites to send background push messages + </message> + <message name="IDS_PUSH_MESSSAGING_ASK_RADIO" desc="A radio button in Content Settings dialog to allow a site to query the permision send push messages."> + Ask me when a site wants to send me push messages (recommended) + </message> + <message name="IDS_PUSH_MESSSAGING_BLOCK_RADIO" desc="A radio button in Content Settings dialog to deny a site to send push messages."> + Do not allow any sites to send push messages + </message> </messages> </release> </grit> |