| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 769938ceb7ad980bf1def0aa05ef054574d692c9..1e89bc5e1fa01af18f2f7e1e1f9faba4a1c4e753 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -287,7 +287,7 @@
|
| #endif
|
|
|
| #if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| -#include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
|
| +#include "content/public/common/web_usb_permission_request.mojom.h"
|
| #endif
|
|
|
| #if defined(ENABLE_WAYLAND_SERVER)
|
| @@ -673,9 +673,9 @@ void CreateUsbDeviceManager(
|
| }
|
|
|
| #if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| -void CreateWebUsbPermissionBubble(
|
| +void CreateWebUsbPermissionRequest(
|
| RenderFrameHost* render_frame_host,
|
| - mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
|
| + mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) {
|
| WebContents* web_contents =
|
| WebContents::FromRenderFrameHost(render_frame_host);
|
| if (!web_contents) {
|
| @@ -685,7 +685,7 @@ void CreateWebUsbPermissionBubble(
|
|
|
| UsbTabHelper* tab_helper =
|
| UsbTabHelper::GetOrCreateForWebContents(web_contents);
|
| - tab_helper->CreatePermissionBubble(render_frame_host, std::move(request));
|
| + tab_helper->CreatePermissionRequest(render_frame_host, std::move(request));
|
| }
|
| #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
|
|
|
| @@ -2658,7 +2658,7 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
|
| registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host));
|
| #if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| registry->AddService(
|
| - base::Bind(&CreateWebUsbPermissionBubble, render_frame_host));
|
| + base::Bind(&CreateWebUsbPermissionRequest, render_frame_host));
|
| #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
|
| }
|
|
|
|
|