chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc - 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: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

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

Patch Set: Updated policy Created 5 years, 10 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/ui/webui/options/content_settings_handler.cc ('K') | « chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h ('k') | chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc » ('j') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

index e3e4d25d6ede907a81910d6bc3e0e2665b0f8ddf..7f05fcdeb0aab5a68d54653e705f9c53daf5fb63 100644

--- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

+++ b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

@@ -96,9 +96,11 @@ void PepperFlashContentSettingsUtils::SortMediaExceptions(

// static

bool PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(

- ContentSetting default_setting_1,

+ ContentSetting default_audio_setting_1,

+ ContentSetting default_video_setting_1,

const MediaExceptions& exceptions_1,

- ContentSetting default_setting_2,

+ ContentSetting default_audio_setting_2,

+ ContentSetting default_video_setting_2,

const MediaExceptions& exceptions_2,

bool ignore_audio_setting,

bool ignore_video_setting) {

@@ -106,11 +108,11 @@ bool PepperFlashContentSettingsUtils::AreMediaExceptionsEqual(

MediaExceptions::const_iterator iter_2 = exceptions_2.begin();

MediaException default_exception_1(ContentSettingsPattern(),

- default_setting_1,

- default_setting_1);

+ default_audio_setting_1,

+ default_video_setting_1);

MediaException default_exception_2(ContentSettingsPattern(),

- default_setting_2,

- default_setting_2);

+ default_audio_setting_2,

+ default_video_setting_2);

while (iter_1 != exceptions_1.end() && iter_2 != exceptions_2.end()) {

int compare_result = CompareMediaException(*iter_1, *iter_2);