Adding <keygen> Content Setting (Android UI)

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences.website;
 
 import org.chromium.chrome.browser.ContentSettingsType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ skipping 54 matching lines @@
         queue.add(new FullscreenInfoFetcher());
         // Local storage info is per-origin.
         queue.add(new LocalStorageInfoFetcher());
         // Website storage is per-host.
         queue.add(new WebStorageInfoFetcher());
         // Popup exceptions are host-based patterns (unless we start
         // synchronizing popup exceptions with desktop Chrome.)
         queue.add(new PopupExceptionInfoFetcher());
         // JavaScript exceptions are host-based patterns.
         queue.add(new JavaScriptExceptionInfoFetcher());
+        // Keygen exceptions are host-based patterns.
+        queue.add(new KeygenExceptionInfoFetcher());
         // Protected media identifier permission is per-origin and per-embedder.
         queue.add(new ProtectedMediaIdentifierInfoFetcher());
         // Push notification permission is per-origin and per-embedder.
         queue.add(new PushNotificationInfoFetcher());
         // 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();
@@ skipping 32 matching lines @@
         } else if (category.showMicrophoneSites()) {
             // Micropohone capture permission is per-origin and per-embedder.
             queue.add(new MicrophoneCaptureInfoFetcher());
         } else if (category.showPopupSites()) {
             // Popup exceptions are host-based patterns (unless we start
             // synchronizing popup exceptions with desktop Chrome.)
             queue.add(new PopupExceptionInfoFetcher());
         } else if (category.showJavaScriptSites()) {
             // JavaScript exceptions are host-based patterns.
             queue.add(new JavaScriptExceptionInfoFetcher());
+        } else if (category.showKeygenSites()) {
+            // Keygen exceptions are host-based patterns.
+            queue.add(new KeygenExceptionInfoFetcher());

[Finnur, 2015/11/05 20:44:41]

This is only required if you have a specific first-class citizen category. Note
that Midi doesn't need it.

And then the question becomes: Do you need the showKeygenSites function?

[svaldez, 2015/11/10 15:25:02]

Done.

         } else if (category.showNotificationsSites()) {
             // Push notification permission is per-origin and per-embedder.
             queue.add(new PushNotificationInfoFetcher());
         } else if (category.showProtectedMediaSites()) {
             // Protected media identifier permission is per-origin and per-embedder.
             queue.add(new ProtectedMediaIdentifierInfoFetcher());
         }
         queue.add(new PermissionsAvailableCallbackRunner());
         queue.next();
     }
@@ skipping 101 matching lines @@
                 if (address == null) continue;
                 Set<Website> sites = findOrCreateSitesByHost(address);
                 for (Website site : sites) {
                     site.setJavaScriptException(exception);
                 }
             }
             queue.next();
         }
     }
 
+    private class KeygenExceptionInfoFetcher implements Task {
+        @Override
+        public void run(TaskQueue queue) {
+            for (ContentSettingException exception :
+                    WebsitePreferenceBridge.getContentSettingsExceptions(
+                            ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN)) {
+                // The pattern "*" represents the default setting, not a specific website.
+                if (exception.getPattern().equals("*")) continue;
+                WebsiteAddress address = WebsiteAddress.create(exception.getPattern());
+                if (address == null) continue;
+                Set<Website> sites = findOrCreateSitesByHost(address);
+                for (Website site : sites) {
+                    site.setKeygenException(exception);
+                }
+            }
+            queue.next();
+        }
+    }
+
     private class CookieInfoFetcher implements Task {
         @Override
         public void run(TaskQueue queue) {
             for (CookieInfo info : WebsitePreferenceBridge.getCookieInfo()) {
                 WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
                 if (address == null) continue;
                 createSiteByOriginAndHost(address).setCookieInfo(info);
             }
             queue.next();
         }
@@ skipping 111 matching lines @@
     }
 
     private class PermissionsAvailableCallbackRunner implements Task {
         @Override
         public void run(TaskQueue queue) {
             mCallback.onWebsitePermissionsAvailable(mSitesByOrigin, mSitesByHost);
             queue.next();
         }
     }
 }