chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java - Issue 1084423002: Split Camera and Mic into two permissions on the Site Details page (under Site Settings).

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/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java

Issue 1084423002: Split Camera and Mic into two permissions on the Site Details page (under Site Settings). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Polish Created 5 years, 8 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/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java

index 3dec96e141a1efdbc541fed8ee263bb35a199df9..aa1a02a4a26e9ed146d2d2b42181f5e93e482b61 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java

@@ -202,8 +202,8 @@ public class WebsitePreferences extends PreferenceFragment

if (mFilter.showCookiesSites(mCategoryFilter)) {

return website.site().getCookiePermission() == ContentSetting.BLOCK;

} else if (mFilter.showCameraMicSites(mCategoryFilter)) {

- return website.site().getVoiceCapturePermission() == ContentSetting.BLOCK

- || website.site().getVideoCapturePermission() == ContentSetting.BLOCK;

+ return website.site().getVoiceCapturePermission() != ContentSetting.ALLOW

newt (away) 2015/04/16 17:11:20 Why this change?

+ && website.site().getVideoCapturePermission() != ContentSetting.ALLOW;

} else if (mFilter.showFullscreenSites(mCategoryFilter)) {

return website.site().getFullscreenPermission() == ContentSetting.ASK;

} else if (mFilter.showGeolocationSites(mCategoryFilter)) {