WebUsb Android chooser UI

chrome/browser/usb/usb_tab_helper.cc

 // 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.
 
 #include "chrome/browser/usb/usb_tab_helper.h"
 
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/usb/web_usb_chooser_service.h"
 #include "chrome/browser/usb/web_usb_permission_provider.h"
 #include "device/usb/mojo/device_manager_impl.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/usb/web_usb_chooser_service_android.h"
+#else
+#include "chrome/browser/usb/web_usb_chooser_service.h"
+#endif  // defined(OS_ANDROID)
+
 using content::RenderFrameHost;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper);
 
 struct FrameUsbServices {
   scoped_ptr<WebUSBPermissionProvider> permission_provider;
+#if defined(OS_ANDROID)
+  scoped_ptr<WebUsbChooserServiceAndroid> chooser_service;
+#else
   scoped_ptr<WebUsbChooserService> chooser_service;
+#endif  // defined(OS_ANDROID)

[Reilly Grant (use Gerrit), 2016/03/04 20:53:39]

You can avoid these ifdefs by making this a
scoped_ptr<device::usb::ChooserService>.

[juncai, 2016/03/05 00:18:25]

If making this a scoped_ptr<device::usb::ChooserService>, then line:
frame_usb_services->chooser_service->Bind(std::move(request));
need pointer cast.

 };
 
 // static
 UsbTabHelper* UsbTabHelper::GetOrCreateForWebContents(
     WebContents* web_contents) {
   UsbTabHelper* tab_helper = FromWebContents(web_contents);
   if (!tab_helper) {
     CreateForWebContents(web_contents);
     tab_helper = FromWebContents(web_contents);
   }
   return tab_helper;
 }
 
 UsbTabHelper::~UsbTabHelper() {}
 
 void UsbTabHelper::CreateDeviceManager(
     RenderFrameHost* render_frame_host,
     mojo::InterfaceRequest<device::usb::DeviceManager> request) {
   DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents());
   device::usb::PermissionProviderPtr permission_provider;
   GetPermissionProvider(render_frame_host,
                         mojo::GetProxy(&permission_provider));
   device::usb::DeviceManagerImpl::Create(std::move(permission_provider),
                                          std::move(request));
 }
 
-#if !defined(OS_ANDROID)
 void UsbTabHelper::CreateChooserService(
     content::RenderFrameHost* render_frame_host,
     mojo::InterfaceRequest<device::usb::ChooserService> request) {
   GetChooserService(render_frame_host, std::move(request));
 }
-#endif  // !defined(OS_ANDROID)
 
 UsbTabHelper::UsbTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {}
 
 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) {
   frame_usb_services_.erase(render_frame_host);
 }
 
 FrameUsbServices* UsbTabHelper::GetFrameUsbService(
     content::RenderFrameHost* render_frame_host) {
@@ skipping 12 matching lines @@
     RenderFrameHost* render_frame_host,
     mojo::InterfaceRequest<device::usb::PermissionProvider> request) {
   FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
   if (!frame_usb_services->permission_provider) {
     frame_usb_services->permission_provider.reset(
         new WebUSBPermissionProvider(render_frame_host));
   }
   frame_usb_services->permission_provider->Bind(std::move(request));
 }
 
-#if !defined(OS_ANDROID)
 void UsbTabHelper::GetChooserService(
     content::RenderFrameHost* render_frame_host,
     mojo::InterfaceRequest<device::usb::ChooserService> request) {
   FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
   if (!frame_usb_services->chooser_service) {
     frame_usb_services->chooser_service.reset(
+#if defined(OS_ANDROID)
+        new WebUsbChooserServiceAndroid(render_frame_host));
+#else
         new WebUsbChooserService(render_frame_host));
+#endif  // defined(OS_ANDROID)
   }
   frame_usb_services->chooser_service->Bind(std::move(request));
 }
-#endif  // !defined(OS_ANDROID)