| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
|
| index 981c9866661702c1979dbeb95566df617fcea1c7..8f319f57bdbada692f6a8cfe4b889487d128350f 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
|
| @@ -78,6 +78,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
|
| public static final String PREF_LOCATION_ACCESS = "location_access_list";
|
| public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permission_list";
|
| public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permission_list";
|
| + public static final String PREF_SENSORS_PERMISSION = "sensors_permission_list";
|
| public static final String PREF_NOTIFICATIONS_PERMISSION = "push_notifications_list";
|
| public static final String PREF_POPUP_PERMISSION = "popup_permission_list";
|
| public static final String PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION =
|
| @@ -556,6 +557,8 @@ public class SingleWebsitePreferences extends PreferenceFragment
|
| return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
|
| case PREF_MIDI_SYSEX_PERMISSION:
|
| return ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
|
| + case PREF_SENSORS_PERMISSION:
|
| + return ContentSettingsType.CONTENT_SETTINGS_TYPE_SENSORS;
|
| case PREF_NOTIFICATIONS_PERMISSION:
|
| return ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
|
| case PREF_POPUP_PERMISSION:
|
| @@ -620,6 +623,8 @@ public class SingleWebsitePreferences extends PreferenceFragment
|
| mSite.setMicrophonePermission(permission);
|
| } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) {
|
| mSite.setMidiPermission(permission);
|
| + } else if (PREF_SENSORS_PERMISSION.equals(preference.getKey())) {
|
| + mSite.setSensorsPermission(permission);
|
| } else if (PREF_NOTIFICATIONS_PERMISSION.equals(preference.getKey())) {
|
| mSite.setNotificationPermission(permission);
|
| } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) {
|
| @@ -693,6 +698,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
|
| mSite.setKeygenPermission(ContentSetting.DEFAULT);
|
| mSite.setMicrophonePermission(ContentSetting.DEFAULT);
|
| mSite.setMidiPermission(ContentSetting.DEFAULT);
|
| + mSite.setSensorsPermission(ContentSetting.DEFAULT);
|
| mSite.setNotificationPermission(ContentSetting.DEFAULT);
|
| mSite.setPopupPermission(ContentSetting.DEFAULT);
|
| mSite.setProtectedMediaIdentifierPermission(ContentSetting.DEFAULT);
|
|
|