chrome/browser/resources/options2/content_settings.html - 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/browser/resources/options2/content_settings.html

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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/resources/options2/content_settings.html

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

--- chrome/browser/resources/options2/content_settings.html (revision 141490)

+++ chrome/browser/resources/options2/content_settings.html (working copy)

@@ -257,27 +257,6 @@

</label>

</div>

</section>

-

- <section id="pepper-flash-cameramic-section" class="pepper-flash-settings">

- <h3 i18n-content="pepperFlashCameramicTabLabel"></h3>

- <div>

- <div class="radio">

- <label>

- <input type="radio" name="pepper-flash-cameramic" value="ask">

- <span i18n-content="pepperFlashCameramicAsk"></span>

- </label>

- </div>

- <div class="radio">

- <label>

- <input type="radio" name="pepper-flash-cameramic" value="block">

- <span i18n-content="pepperFlashCameramicBlock"></span>

- </label>

- </div>

- <button class="exceptions-list-button"

- contentType="pepper-flash-cameramic"

- i18n-content="manage_exceptions"></button>

- </div>

- </section>

« no previous file with comments | « chrome/browser/pepper_flash_settings_manager.cc ('k') | chrome/browser/resources/options2/content_settings.js » ('j') | no next file with comments »