Adding <keygen> Content Setting (Android UI)

chrome/browser/ui/android/website_settings_popup_android.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/ui/android/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 84 matching lines @@
 
   // On Android, we only want to display a subset of the available options in a
   // particular order, but only if their value is different from the default.
   std::vector<ContentSettingsType> permissions_to_display;
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
+  permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN);

[Finnur, 2015/11/11 10:25:45]

I don't quite understand how this list work and why it is only a subset of the
first-class types that we show...? For example, where are Cookies, Popups,
Fullscreen, and Protected Content?

Images are also listed here, even though they are not shown under Site Settings.

What is the deal?

[svaldez, 2015/11/19 17:50:25]

I think this is a slightly different UI than the Site Settings window? I don't
think KEYGEN needs to be implemented here.

[Finnur, 2015/12/01 23:19:57]

If I'm not mistaken, this is the gatekeeper for the information that shows when
you click on the lock/page icon for a given site (the origin info bubble). It
would be good to keep that in sync with the site settings UI, so I suspect
keygen *should* be listed here (and UI changes added to show keygen as well).
You should consult egm@ on this.

   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
 
   std::map<ContentSettingsType, ContentSetting>
       user_specified_settings_to_display;
 
   for (const auto& permission : permission_info_list) {
     if (std::find(permissions_to_display.begin(),
                   permissions_to_display.end(),
                   permission.type) != permissions_to_display.end() &&
         permission.setting != CONTENT_SETTING_DEFAULT) {
@@ skipping 22 matching lines @@
     WebsiteSettingsUI::TabId tab_id) {
   // There's no tab UI on Android - only connection info is shown.
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }