chrome/browser/ui/webui/options2/content_settings_handler2.h - Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

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/ui/webui/options2/content_settings_handler2.h

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased, addressed comments from Ivan, let "block" apply before exceptions 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

« chrome/browser/resources/options2/content_settings_exceptions_area.js ('K') | « chrome/browser/ui/views/infobars/media_stream_infobar.cc ('k') | chrome/browser/ui/webui/options2/content_settings_handler2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/content_settings_handler2.h

diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.h b/chrome/browser/ui/webui/options2/content_settings_handler2.h

index 8c4ae5f8d4f4a7a437b246f529908ccebdc97825..b895df2a4ab56a7356429dcddccebeba7a5199b7 100644

--- a/chrome/browser/ui/webui/options2/content_settings_handler2.h

+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.h

@@ -92,6 +92,8 @@ class ContentSettingsHandler : public OptionsPageUIHandler,

// Clobbers and rebuilds just the Pepper Flash camera and microphone exception

// table.

void UpdateFlashCameraMicExceptionsView();

+ // Clobbers and rebuilds just the mediastream device exception table.

+ void UpdateMediaStreamExceptionsView();

// Clobbers and rebuilds an exception table that's managed by the host content

// settings map.

void UpdateExceptionsViewFromHostContentSettingsMap(ContentSettingsType type);