Reland: Add webusb permission bubble mojom

content/renderer/usb/web_usb_client_impl.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 "content/renderer/usb/web_usb_client_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/move.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/child/mojo/type_converters.h"
 #include "content/child/scoped_web_callbacks.h"
 #include "content/public/common/service_registry.h"
 #include "content/renderer/usb/type_converters.h"
 #include "content/renderer/usb/web_usb_device_impl.h"
 #include "third_party/WebKit/public/platform/WebCallbacks.h"
 #include "third_party/WebKit/public/platform/WebPassOwnPtr.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceFilter.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceRequestOptions.h"
 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBError.h"
@@ skipping 35 matching lines @@
       new blink::WebVector<blink::WebUSBDevice*>(results.size());
   for (size_t i = 0; i < results.size(); ++i) {
     device::usb::DevicePtr device;
     device_manager->GetDevice(results[i]->guid, mojo::GetProxy(&device));
     (*devices)[i] = new WebUSBDeviceImpl(
         device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(results[i]));
   }
   scoped_callbacks.PassCallbacks()->onSuccess(blink::adoptWebPtr(devices));
 }
 
+void OnRequestDevicesComplete(
+    ScopedWebCallbacks<blink::WebUSBClientRequestDeviceCallbacks> callbacks,
+    device::usb::DeviceManager* device_manager,
+    device::usb::DeviceInfoPtr result) {
+  auto scoped_callbacks = callbacks.PassCallbacks();
+  if (result) {
+    device::usb::DevicePtr device;
+    device_manager->GetDevice(result->guid, mojo::GetProxy(&device));
+    blink::WebUSBDevice* web_usb_device = new WebUSBDeviceImpl(
+        device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(result));
+
+    scoped_callbacks->onSuccess(blink::adoptWebPtr(web_usb_device));
+  } else {
+    scoped_callbacks->onSuccess(
+        blink::adoptWebPtr<blink::WebUSBDevice>(nullptr));
+  }
+}
+
 }  // namespace
 
 WebUSBClientImpl::WebUSBClientImpl(content::ServiceRegistry* service_registry)
     : service_registry_(service_registry) {}
 
 WebUSBClientImpl::~WebUSBClientImpl() {}
 
 void WebUSBClientImpl::getDevices(
     blink::WebUSBClientGetDevicesCallbacks* callbacks) {
   auto scoped_callbacks = MakeScopedUSBCallbacks(callbacks);
   GetDeviceManager()->GetDevices(
       nullptr,
       base::Bind(&OnGetDevicesComplete, base::Passed(&scoped_callbacks),
                  base::Unretained(device_manager_.get())));
 }
 
 void WebUSBClientImpl::requestDevice(
     const blink::WebUSBDeviceRequestOptions& options,
     blink::WebUSBClientRequestDeviceCallbacks* callbacks) {
-  callbacks->onError(blink::WebUSBError(blink::WebUSBError::Error::Service,
-                                        base::UTF8ToUTF16("Not implemented.")));
-  delete callbacks;
+  if (!webusb_permission_bubble_) {
+    service_registry_->ConnectToRemoteService(
+        mojo::GetProxy(&webusb_permission_bubble_));
+  }
+
+  auto scoped_callbacks = MakeScopedUSBCallbacks(callbacks);
+
+  mojo::Array<device::usb::DeviceFilterPtr> device_filters =
+      mojo::Array<device::usb::DeviceFilterPtr>::From(options.filters);
+
+  webusb_permission_bubble_->GetPermission(
+      device_filters.Pass(),
+      base::Bind(&OnRequestDevicesComplete, base::Passed(&scoped_callbacks),
+                 base::Unretained(device_manager_.get())));
 }
 
 void WebUSBClientImpl::setObserver(Observer* observer) {
   if (!observer_) {
     // Set up two sequential calls to GetDeviceChanges to avoid latency.
     device::usb::DeviceManager* device_manager = GetDeviceManager();
     device_manager->GetDeviceChanges(base::Bind(
         &WebUSBClientImpl::OnDeviceChangeNotification, base::Unretained(this)));
     device_manager->GetDeviceChanges(base::Bind(
         &WebUSBClientImpl::OnDeviceChangeNotification, base::Unretained(this)));
@@ skipping 27 matching lines @@
     const device::usb::DeviceInfoPtr& device_info =
         notification->devices_removed[i];
     device::usb::DevicePtr device;
     device_manager_->GetDevice(device_info->guid, mojo::GetProxy(&device));
     observer_->onDeviceDisconnected(blink::adoptWebPtr(new WebUSBDeviceImpl(
         device.Pass(), mojo::ConvertTo<blink::WebUSBDeviceInfo>(device_info))));
   }
 }
 
 }  // namespace content