Display USB devices in the site settings popup on Android.

chrome/browser/ui/android/website_settings_popup_android.cc

Index: chrome/browser/ui/android/website_settings_popup_android.cc
diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc
index 75b5e48c7fa677b1f042d16144e9d9bba4efe90e..541811656dbc41da679cd43c11478b60f966f148 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.cc
+++ b/chrome/browser/ui/android/website_settings_popup_android.cc
@@ -93,11 +93,6 @@ void WebsiteSettingsPopupAndroid::SetCookieInfo(
 void WebsiteSettingsPopupAndroid::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
-  // TODO(reillyg): Display the contents of |chosen_object_info_list|.
-  // https://crbug.com/424667.
-  STLDeleteContainerPointers(chosen_object_info_list.begin(),

[Yaron, 2016/08/01 02:22:58]

these should still be freed at the end, shouldn't they? Everything in java is a
copy

[Reilly Grant (use Gerrit), 2016/08/01 19:00:49]

You're right. Thanks.

-                             chosen_object_info_list.end());
-
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // On Android, we only want to display a subset of the available options in a
@@ -136,6 +131,17 @@ void WebsiteSettingsPopupAndroid::SetPermissionInfo(
     }
   }
 
+  for (const auto& chosen_object : chosen_object_info_list) {
+    base::string16 object_title =
+        WebsiteSettingsUI::ChosenObjectToUIString(*chosen_object);
+
+    Java_WebsiteSettingsPopup_addPermissionSection(
+        env, popup_jobject_.obj(),
+        ConvertUTF16ToJavaString(env, object_title).obj(),
+        static_cast<jint>(chosen_object->ui_info.content_settings_type),
+        static_cast<jint>(CONTENT_SETTING_ALLOW));
+  }
+
   Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_.obj());
 }