components/content_settings/core/browser/content_settings_default_provider.h - Issue 965103004: Stop using the MEDIASTREAM content setting.

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: components/content_settings/core/browser/content_settings_default_provider.h

Issue 965103004: Stop using the MEDIASTREAM content setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase over 1004733003. Created 5 years, 9 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

« no previous file with comments | « chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/content_settings_default_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_default_provider.h

diff --git a/components/content_settings/core/browser/content_settings_default_provider.h b/components/content_settings/core/browser/content_settings_default_provider.h

index 2a58fa869b44f82948ecaa15038206b2ba67da73..86ec1c847d217ddc96bcea5cb7aeee003b7bf79b 100644

--- a/components/content_settings/core/browser/content_settings_default_provider.h

+++ b/components/content_settings/core/browser/content_settings_default_provider.h

@@ -97,6 +97,10 @@ class DefaultProvider : public ObservableProvider {

// once during the first run.

void MigrateDefaultSettings();

+ // Migrates the obsolete media stream default setting to the new microphone

+ // and camera settings.

+ void MigrateObsoleteMediaContentSetting();

// Copies of the pref data, so that we can read it on the IO thread.

ValueMap default_settings_;