Display USB devices in the site settings popup on Android.

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 "base/stl_util.h"
@@ skipping 75 matching lines @@
 }
 
 void WebsiteSettingsPopupAndroid::SetCookieInfo(
     const CookieInfoList& cookie_info_list) {
   NOTIMPLEMENTED();
 }
 
 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
   // 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);
@@ skipping 18 matching lines @@
 
       Java_WebsiteSettingsPopup_addPermissionSection(
           env,
           popup_jobject_.obj(),
           ConvertUTF16ToJavaString(env, setting_title).obj(),
           static_cast<jint>(permission),
           static_cast<jint>(user_specified_settings_to_display[permission]));
     }
   }
 
+  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());
 }
 
 void WebsiteSettingsPopupAndroid::SetSelectedTab(
     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);
 }