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: Migration code added. 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

« chrome/browser/media/media_stream_devices_controller.cc ('K') | « 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 6679bdc33197915c89ab91919b5453ce395a039e..5e4caabdbc1eca82235bc165682ecc03d5b83a7a 100644

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

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

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

// Called on prefs change.

void OnPreferenceChanged(const std::string& pref_name);

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

+ // and camera settings.

+ void MigrateObsoleteMediaContentSetting();

typedef linked_ptr<base::Value> ValuePtr;

typedef std::map<ContentSettingsType, ValuePtr> ValueMap;

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