Display USB devices in the site settings popup on Android.

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 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/website_settings/website_settings.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 183 matching lines @@
 }
 
 ChooserContextBase* GetUsbChooserContext(Profile* profile) {
   return UsbChooserContextFactory::GetForProfile(profile);
 }
 
 // The list of chooser types that need to display entries in the Website
 // Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it,
 // email security-dev@chromium.org.
 WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {
-    {&GetUsbChooserContext, IDR_BLOCKED_USB, IDR_ALLOWED_USB,
-     IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
+    {CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, &GetUsbChooserContext,

[benwells, 2016/07/28 07:51:13]

Is there a plan to remove this USB specific code from this file? It is wrong to
have it here.

[Reilly Grant (use Gerrit), 2016/07/28 17:55:43]

Can you explain why it is wrong to have this here? There is specific code for
every permission in this file.

[benwells, 2016/07/29 05:01:39]

OK, my bad, I got a bit mixed up.

+     IDR_BLOCKED_USB, IDR_ALLOWED_USB, IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
      IDS_WEBSITE_SETTINGS_DELETE_USB_DEVICE, "name"},
 };
 
 }  // namespace
 
 WebsiteSettings::WebsiteSettings(
     WebsiteSettingsUI* ui,
     Profile* profile,
     TabSpecificContentSettings* tab_specific_content_settings,
     content::WebContents* web_contents,
@@ skipping 546 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.cert_id = cert_id_;
   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
   ui_->SetIdentityInfo(info);
 }