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

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

Issue 1742753002: Rename web_usb_permission_bubble.cc/h and webusb_permission_bubble.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated usb_chooser_bubble_controller.cc/h Created 4 years, 10 months 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 ed9246a0aefc0b5baf37c44c442576d23e3cefbb..6dfe532a7292609f459dcdbb3affcef03f754932 100644
--- a/content/renderer/usb/web_usb_client_impl.cc
+++ b/content/renderer/usb/web_usb_client_impl.cc
@@ -107,9 +107,9 @@ void WebUSBClientImpl::getDevices(
void WebUSBClientImpl::requestDevice(
const blink::WebUSBDeviceRequestOptions& options,
blink::WebUSBClientRequestDeviceCallbacks* callbacks) {
- if (!webusb_permission_bubble_) {
+ if (!chooser_service_) {
service_registry_->ConnectToRemoteService(
- mojo::GetProxy(&webusb_permission_bubble_));
+ mojo::GetProxy(&chooser_service_));
}
auto scoped_callbacks = MakeScopedUSBCallbacks(callbacks);
@@ -117,7 +117,7 @@ void WebUSBClientImpl::requestDevice(
mojo::Array<device::usb::DeviceFilterPtr> device_filters =
mojo::Array<device::usb::DeviceFilterPtr>::From(options.filters);
- webusb_permission_bubble_->GetPermission(
+ chooser_service_->GetPermission(
std::move(device_filters),
base::Bind(&OnRequestDevicesComplete, base::Passed(&scoped_callbacks),
base::Unretained(device_manager_.get())));

Powered by Google App Engine
This is Rietveld 408576698