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

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/content_settings_handler.cc ('k') | chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.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.h

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

index 7d4b3615be3b69dfd779925ca34e5d0cf104d177..7cbe68d5db0d0add08eefba7be150beb156ab979 100644

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

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

@@ -53,9 +53,11 @@ class PepperFlashContentSettingsUtils {

// |ignore_audio_setting| and |ignore_video_setting| specify whether to skip

// comparison of the |audio_setting| and |video_setting| field of

// MediaException, respectively.

- static bool AreMediaExceptionsEqual(ContentSetting default_setting_1,

+ static bool AreMediaExceptionsEqual(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);