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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.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/website/SingleWebsitePreferences.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6aeb76df132dcd9561ab85516718726a297d5351..9f55bcbe99f206800e7a28d2b61051d77d3a2952 100644

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

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

@@ -27,6 +27,10 @@ public class ContentSettingsResources {

return R.drawable.permission_javascript;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM:

return R.drawable.permission_media;

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:

+ return R.drawable.permission_media;

newt (away) 2015/04/16 17:11:20 rename "permission_media.png" to "permission_camer

Finnur 2015/04/22 16:01:38 Done.

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:

+ return R.drawable.permission_mic;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX:

return R.drawable.permission_midi;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

@@ -81,6 +85,10 @@ public class ContentSettingsResources {

return R.string.geolocation_permission_title;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT:

return R.string.javascript_permission_title;

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:

+ return R.string.video_permission_title;

newt (away) 2015/04/16 17:11:20 consistent naming, as above

Finnur 2015/04/22 16:01:38 Done.

+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:

+ return R.string.voice_permission_title;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX:

return R.string.midi_sysex_permission_title;

case ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS: