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 4b6f8060e8213cb17bae31d0574e5c101fa0b47c..d8875fb939dde7f2b05fa3a7a4d6be2a55c2b0ad 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 |
@@ -25,6 +25,8 @@ public class ContentSettingsResources { |
return R.drawable.permission_location; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT: |
return R.drawable.permission_javascript; |
+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN: |
+ return R.drawable.permission_javascript; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
return R.drawable.permission_camera; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
@@ -56,6 +58,8 @@ public class ContentSettingsResources { |
return R.string.website_settings_device_location; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT: |
return R.string.javascript_permission_title; |
+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN: |
+ return R.string.keygen_permission_title; |
Finnur
2015/11/11 10:25:45
This is not required by MIDI, so it should not be
svaldez
2015/11/19 17:50:25
Done.
|
case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
return R.string.website_settings_use_camera; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
@@ -85,6 +89,8 @@ 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_KEYGEN: |
+ return R.string.keygen_permission_title; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
return R.string.camera_permission_title; |
case ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |