Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2087)

Unified Diff: content/renderer/usb/web_usb_client_impl.cc

Issue 1408193003: Add chrome side webusb permission UI code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: call UsbChooserContext::GrantDevicePermission when user grants permission to a device Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/usb/web_usb_client_impl.cc
diff --git a/content/renderer/usb/web_usb_client_impl.cc b/content/renderer/usb/web_usb_client_impl.cc
index 5ece47176831e87878ef90183ea427a03b9a9aa2..e10cf9a6ffdad12d955972beeaf5b75a201dabc2 100644
--- a/content/renderer/usb/web_usb_client_impl.cc
+++ b/content/renderer/usb/web_usb_client_impl.cc
@@ -65,6 +65,7 @@ void OnGetDevicesComplete(
scoped_callbacks.PassCallbacks()->onSuccess(blink::adoptWebPtr(devices));
}
+#if !defined(OS_MACOSX)
void OnRequestDevicesComplete(
ScopedWebCallbacks<blink::WebUSBClientRequestDeviceCallbacks> callbacks,
device::usb::DeviceManager* device_manager,
@@ -82,6 +83,7 @@ void OnRequestDevicesComplete(
blink::adoptWebPtr<blink::WebUSBDevice>(nullptr));
}
}
+#endif
} // namespace
@@ -102,6 +104,11 @@ void WebUSBClientImpl::getDevices(
void WebUSBClientImpl::requestDevice(
const blink::WebUSBDeviceRequestOptions& options,
blink::WebUSBClientRequestDeviceCallbacks* callbacks) {
+#if defined(OS_MACOSX)
+ callbacks->onError(blink::WebUSBError(blink::WebUSBError::Error::Service,
+ base::UTF8ToUTF16("Not implemented.")));
+ delete callbacks;
+#else
if (!webusb_permission_bubble_) {
service_registry_->ConnectToRemoteService(
mojo::GetProxy(&webusb_permission_bubble_));
@@ -116,6 +123,7 @@ void WebUSBClientImpl::requestDevice(
device_filters.Pass(),
base::Bind(&OnRequestDevicesComplete, base::Passed(&scoped_callbacks),
base::Unretained(device_manager_.get())));
+#endif
}
void WebUSBClientImpl::setObserver(Observer* observer) {
« chrome/browser/usb/web_usb_permission_bubble.cc ('K') | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698