chrome/app/generated_resources.grd - Issue 10536103: Revert 141482 - Pepper Flash settings integration - camera and microphone.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.

Issue 10536103: Revert 141482 - Pepper Flash settings integration - camera and microphone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Download patch

Index: chrome/app/generated_resources.grd

===================================================================

--- chrome/app/generated_resources.grd (revision 141490)

+++ chrome/app/generated_resources.grd (working copy)

@@ -6960,18 +6960,6 @@

Do not allow any site to disable the mouse cursor

</message>

- <message name="IDS_PEPPER_FLASH_CAMERAMIC_TAB_LABEL" desc="Label for Pepper Flash camera and microphone tab on Content Settings dialog">

- Flash camera and microphone

- </message>

- <message name="IDS_PEPPER_FLASH_CAMERAMIC_HEADER" desc="Label for Pepper Flash camera and microphone exception management page on Content Settings dialog">

- Flash camera and microphone exceptions

- </message>

- <message name="IDS_PEPPER_FLASH_CAMERAMIC_ASK_RADIO" desc="A radio button in the Content Settings dialog for asking before allowing sites to use the camera or microphone.">

- Ask me when a site wants to use the camera or microphone (recommended)

- </message>

- <message name="IDS_PEPPER_FLASH_CAMERAMIC_BLOCK_RADIO" desc="A radio button in the Content Settings dialog for blocking all sites from using the camera and microphone.">

- Block all sites from using the camera and microphone

- </message>

Protected Content

« no previous file with comments | « no previous file | chrome/browser/DEPS » ('j') | no next file with comments »