chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.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/WebsiteSettingsPopup.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/res/xml/single_website_preferences.xml ('K') | « chrome/android/java/res/xml/single_website_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/CameraCaptureInfo.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

index 599420e66c5c93ccda9ed5e96fe0f6aaaff0a705..5f7bf580ef0334200c08ae30e9c1dd13083e86c9 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

@@ -412,7 +412,7 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList

case ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION:

return R.drawable.permission_location;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:

- return R.drawable.permission_media;

+ return R.drawable.permission_camera;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:

return R.drawable.permission_mic;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS: