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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.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: Fix test 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
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
index ea0a665bd0806c84ac09191ab2e9fb86c23c7b6c..34d7a1d1273058e17f03cc1a7b33b2bf4934245c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
@@ -78,8 +78,10 @@ public class WebsitePermissionsFetcher {
queue.add(new ProtectedMediaIdentifierInfoFetcher());
// Push notification permission is per-origin and per-embedder.
queue.add(new PushNotificationInfoFetcher());
- // Voice and Video capture permission is per-origin and per-embedder.
- queue.add(new VoiceAndVideoCaptureInfoFetcher());
+ // Camera capture permission is per-origin and per-embedder.
+ queue.add(new CameraCaptureInfoFetcher());
+ // Micropohone capture permission is per-origin and per-embedder.
+ queue.add(new MicrophoneCaptureInfoFetcher());
queue.add(new PermissionsAvailableCallbackRunner());
queue.next();
}
@@ -112,9 +114,12 @@ public class WebsitePermissionsFetcher {
} else if (filterHelper.showFullscreenSites(filter)) {
// Local storage info is per-origin.
queue.add(new FullscreenInfoFetcher());
- } else if (filterHelper.showCameraMicSites(filter)) {
- // Voice and Video capture permission is per-origin and per-embedder.
- queue.add(new VoiceAndVideoCaptureInfoFetcher());
+ } else if (filterHelper.showCameraSites(filter)) {
+ // Camera capture permission is per-origin and per-embedder.
+ queue.add(new CameraCaptureInfoFetcher());
+ } else if (filterHelper.showMicrophoneSites(filter)) {
+ // Micropohone capture permission is per-origin and per-embedder.
+ queue.add(new MicrophoneCaptureInfoFetcher());
} else if (filterHelper.showPopupSites(filter)) {
// Popup exceptions are host-based patterns (unless we start
// synchronizing popup exceptions with desktop Chrome.)
@@ -364,14 +369,25 @@ public class WebsitePermissionsFetcher {
}
}
- private class VoiceAndVideoCaptureInfoFetcher implements Task {
+ private class CameraCaptureInfoFetcher implements Task {
@Override
public void run(TaskQueue queue) {
- for (VoiceAndVideoCaptureInfo info :
- WebsitePreferenceBridge.getVoiceAndVideoCaptureInfo()) {
+ for (CameraInfo info : WebsitePreferenceBridge.getCameraInfo()) {
WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
if (address == null) continue;
- createSiteByOriginAndHost(address).setVoiceAndVideoCaptureInfo(info);
+ createSiteByOriginAndHost(address).setCameraInfo(info);
+ }
+ queue.next();
+ }
+ }
+
+ private class MicrophoneCaptureInfoFetcher implements Task {
+ @Override
+ public void run(TaskQueue queue) {
+ for (MicrophoneInfo info : WebsitePreferenceBridge.getMicrophoneInfo()) {
+ WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
+ if (address == null) continue;
+ createSiteByOriginAndHost(address).setMicrophoneInfo(info);
}
queue.next();
}

Powered by Google App Engine
This is Rietveld 408576698