Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

Issue 2458453002: [sensors] Add Permission guard to the generic sensor apis.
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.preferences.website; 5 package org.chromium.chrome.browser.preferences.website;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.content.DialogInterface; 8 import android.content.DialogInterface;
9 import android.content.res.Resources; 9 import android.content.res.Resources;
10 import android.net.Uri; 10 import android.net.Uri;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 public static final String PREF_AUTOPLAY_PERMISSION = "autoplay_permission_l ist"; 71 public static final String PREF_AUTOPLAY_PERMISSION = "autoplay_permission_l ist";
72 public static final String PREF_BACKGROUND_SYNC_PERMISSION = "background_syn c_permission_list"; 72 public static final String PREF_BACKGROUND_SYNC_PERMISSION = "background_syn c_permission_list";
73 public static final String PREF_CAMERA_CAPTURE_PERMISSION = "camera_permissi on_list"; 73 public static final String PREF_CAMERA_CAPTURE_PERMISSION = "camera_permissi on_list";
74 public static final String PREF_COOKIES_PERMISSION = "cookies_permission_lis t"; 74 public static final String PREF_COOKIES_PERMISSION = "cookies_permission_lis t";
75 public static final String PREF_FULLSCREEN_PERMISSION = "fullscreen_permissi on_list"; 75 public static final String PREF_FULLSCREEN_PERMISSION = "fullscreen_permissi on_list";
76 public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permissi on_list"; 76 public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permissi on_list";
77 public static final String PREF_KEYGEN_PERMISSION = "keygen_permission_list" ; 77 public static final String PREF_KEYGEN_PERMISSION = "keygen_permission_list" ;
78 public static final String PREF_LOCATION_ACCESS = "location_access_list"; 78 public static final String PREF_LOCATION_ACCESS = "location_access_list";
79 public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permiss ion_list"; 79 public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permiss ion_list";
80 public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permissi on_list"; 80 public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permissi on_list";
81 public static final String PREF_SENSORS_PERMISSION = "sensors_permission_lis t";
81 public static final String PREF_NOTIFICATIONS_PERMISSION = "push_notificatio ns_list"; 82 public static final String PREF_NOTIFICATIONS_PERMISSION = "push_notificatio ns_list";
82 public static final String PREF_POPUP_PERMISSION = "popup_permission_list"; 83 public static final String PREF_POPUP_PERMISSION = "popup_permission_list";
83 public static final String PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION = 84 public static final String PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION =
84 "protected_media_identifier_permission_list"; 85 "protected_media_identifier_permission_list";
85 86
86 // All permissions from the permissions preference category must be listed h ere. 87 // All permissions from the permissions preference category must be listed h ere.
87 // TODO(mvanouwerkerk): Use this array in more places to reduce verbosity. 88 // TODO(mvanouwerkerk): Use this array in more places to reduce verbosity.
88 private static final String[] PERMISSION_PREFERENCE_KEYS = { 89 private static final String[] PERMISSION_PREFERENCE_KEYS = {
89 PREF_AUTOPLAY_PERMISSION, 90 PREF_AUTOPLAY_PERMISSION,
90 PREF_BACKGROUND_SYNC_PERMISSION, 91 PREF_BACKGROUND_SYNC_PERMISSION,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 case PREF_JAVASCRIPT_PERMISSION: 550 case PREF_JAVASCRIPT_PERMISSION:
550 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT; 551 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;
551 case PREF_KEYGEN_PERMISSION: 552 case PREF_KEYGEN_PERMISSION:
552 return ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN; 553 return ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN;
553 case PREF_LOCATION_ACCESS: 554 case PREF_LOCATION_ACCESS:
554 return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION; 555 return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;
555 case PREF_MIC_CAPTURE_PERMISSION: 556 case PREF_MIC_CAPTURE_PERMISSION:
556 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ; 557 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ;
557 case PREF_MIDI_SYSEX_PERMISSION: 558 case PREF_MIDI_SYSEX_PERMISSION:
558 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX; 559 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
560 case PREF_SENSORS_PERMISSION:
561 return ContentSettingsType.CONTENT_SETTINGS_TYPE_SENSORS;
559 case PREF_NOTIFICATIONS_PERMISSION: 562 case PREF_NOTIFICATIONS_PERMISSION:
560 return ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS; 563 return ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
561 case PREF_POPUP_PERMISSION: 564 case PREF_POPUP_PERMISSION:
562 return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS; 565 return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS;
563 case PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION: 566 case PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION:
564 return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA _IDENTIFIER; 567 return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA _IDENTIFIER;
565 default: 568 default:
566 return 0; 569 return 0;
567 } 570 }
568 } 571 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) { 616 } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
614 mSite.setJavaScriptPermission(permission); 617 mSite.setJavaScriptPermission(permission);
615 } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) { 618 } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) {
616 mSite.setKeygenPermission(permission); 619 mSite.setKeygenPermission(permission);
617 } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) { 620 } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
618 mSite.setGeolocationPermission(permission); 621 mSite.setGeolocationPermission(permission);
619 } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) { 622 } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) {
620 mSite.setMicrophonePermission(permission); 623 mSite.setMicrophonePermission(permission);
621 } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) { 624 } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) {
622 mSite.setMidiPermission(permission); 625 mSite.setMidiPermission(permission);
626 } else if (PREF_SENSORS_PERMISSION.equals(preference.getKey())) {
627 mSite.setSensorsPermission(permission);
623 } else if (PREF_NOTIFICATIONS_PERMISSION.equals(preference.getKey())) { 628 } else if (PREF_NOTIFICATIONS_PERMISSION.equals(preference.getKey())) {
624 mSite.setNotificationPermission(permission); 629 mSite.setNotificationPermission(permission);
625 } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) { 630 } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) {
626 mSite.setPopupPermission(permission); 631 mSite.setPopupPermission(permission);
627 } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference. getKey())) { 632 } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference. getKey())) {
628 mSite.setProtectedMediaIdentifierPermission(permission); 633 mSite.setProtectedMediaIdentifierPermission(permission);
629 } 634 }
630 635
631 return true; 636 return true;
632 } 637 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 mSite.setBackgroundSyncPermission(ContentSetting.DEFAULT); 691 mSite.setBackgroundSyncPermission(ContentSetting.DEFAULT);
687 mSite.setCameraPermission(ContentSetting.DEFAULT); 692 mSite.setCameraPermission(ContentSetting.DEFAULT);
688 mSite.setCookiePermission(ContentSetting.DEFAULT); 693 mSite.setCookiePermission(ContentSetting.DEFAULT);
689 WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getTitl e()); 694 WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getTitl e());
690 mSite.setFullscreenPermission(ContentSetting.DEFAULT); 695 mSite.setFullscreenPermission(ContentSetting.DEFAULT);
691 mSite.setGeolocationPermission(ContentSetting.DEFAULT); 696 mSite.setGeolocationPermission(ContentSetting.DEFAULT);
692 mSite.setJavaScriptPermission(ContentSetting.DEFAULT); 697 mSite.setJavaScriptPermission(ContentSetting.DEFAULT);
693 mSite.setKeygenPermission(ContentSetting.DEFAULT); 698 mSite.setKeygenPermission(ContentSetting.DEFAULT);
694 mSite.setMicrophonePermission(ContentSetting.DEFAULT); 699 mSite.setMicrophonePermission(ContentSetting.DEFAULT);
695 mSite.setMidiPermission(ContentSetting.DEFAULT); 700 mSite.setMidiPermission(ContentSetting.DEFAULT);
701 mSite.setSensorsPermission(ContentSetting.DEFAULT);
696 mSite.setNotificationPermission(ContentSetting.DEFAULT); 702 mSite.setNotificationPermission(ContentSetting.DEFAULT);
697 mSite.setPopupPermission(ContentSetting.DEFAULT); 703 mSite.setPopupPermission(ContentSetting.DEFAULT);
698 mSite.setProtectedMediaIdentifierPermission(ContentSetting.DEFAULT); 704 mSite.setProtectedMediaIdentifierPermission(ContentSetting.DEFAULT);
699 for (UsbInfo info : mSite.getUsbInfo()) info.revoke(); 705 for (UsbInfo info : mSite.getUsbInfo()) info.revoke();
700 706
701 // Clear the storage and finish the activity if necessary. 707 // Clear the storage and finish the activity if necessary.
702 if (mSite.getTotalUsage() > 0) { 708 if (mSite.getTotalUsage() > 0) {
703 clearStoredData(); 709 clearStoredData();
704 } else { 710 } else {
705 // Clearing stored data implies popping back to parent menu if there 711 // Clearing stored data implies popping back to parent menu if there
706 // is nothing left to show. Therefore, we only need to explicitly 712 // is nothing left to show. Therefore, we only need to explicitly
707 // close the activity if there's no stored data to begin with. 713 // close the activity if there's no stored data to begin with.
708 getActivity().finish(); 714 getActivity().finish();
709 } 715 }
710 } 716 }
711 } 717 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698