summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorgbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 23:43:45 +0000
committergbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 23:43:45 +0000
commit24ad587865388d7f861187fca06c81234f5bff05 (patch)
treed367c443ef34bb61c78c1f07bfd3337b21c3d411 /chrome/app
parent43444d032f7d3eca247149866cde3b811c8c3c06 (diff)
downloadchromium_src-24ad587865388d7f861187fca06c81234f5bff05.zip
chromium_src-24ad587865388d7f861187fca06c81234f5bff05.tar.gz
chromium_src-24ad587865388d7f861187fca06c81234f5bff05.tar.bz2
[WebsiteSettings] Add a flag for using bubbles for permissions requests.
R=leng@chromium.org, markusheintz@chromium.org BUG=332115 Review URL: https://codereview.chromium.org/141003017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index adb8cbc..aa71607 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6860,6 +6860,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION" desc="Description for the about:flags option to embed flash fullscreen within the browser tab.">
Embeds Flash fullscreen windows within the tab contents area and fullscreens the browser window. This makes the Flash fullscreen user experience consistent with all other browser fullscreen modes. When disabled, Flash fullscreen will open in a separate fullscreened window.
</message>
+ <message name="IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME" desc="Title for the flag to enable showing permissions requests in bubbles.">
+ Use Bubbles for Permission Requests
+ </message>
+ <message name="IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION" desc="Description for the flag to enable showing permissions requests in bubbles.">
+ Show content permission requests (e.g. notifications, quota, camera use, microphone use) in bubbles instead of info bars.
+ </message>
<!-- Crashes -->
<message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes page.">