WebUsb Android chooser UI

chrome/browser/usb/usb_tab_helper.cc

Index: chrome/browser/usb/usb_tab_helper.cc
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index 2da44e3668b9b70bdc6b70fe37aaf2b2a1eed0b5..17249856874577f3977fc9b468f5b34c37e2416a 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -7,10 +7,15 @@
 #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;
 
@@ -18,7 +23,11 @@ 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
@@ -45,13 +54,11 @@ void UsbTabHelper::CreateDeviceManager(
                                          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) {}
@@ -84,15 +91,17 @@ void UsbTabHelper::GetPermissionProvider(
   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)