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

Unified Diff: chrome/browser/chrome_content_browser_client.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: rebase Created 4 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/usb/usb_chooser_bubble_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c52adce97cf89e1d709d612fe6eece0a083faed7..6018e4e10572b448cfe297ff52b26d307dd1c36e 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -294,7 +294,7 @@
#endif
#if !defined(OS_ANDROID)
-#include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
+#include "device/usb/public/interfaces/chooser_service.mojom.h"
#endif
#if defined(ENABLE_WAYLAND_SERVER)
@@ -690,9 +690,9 @@ void CreateUsbDeviceManager(
}
#if !defined(OS_ANDROID)
-void CreateWebUsbPermissionBubble(
+void CreateWebUsbChooserService(
RenderFrameHost* render_frame_host,
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
+ mojo::InterfaceRequest<device::usb::ChooserService> request) {
WebContents* web_contents =
WebContents::FromRenderFrameHost(render_frame_host);
if (!web_contents) {
@@ -702,7 +702,7 @@ void CreateWebUsbPermissionBubble(
UsbTabHelper* tab_helper =
UsbTabHelper::GetOrCreateForWebContents(web_contents);
- tab_helper->CreatePermissionBubble(render_frame_host, std::move(request));
+ tab_helper->CreateChooserService(render_frame_host, std::move(request));
}
#endif // !defined(OS_ANDROID)
@@ -2792,7 +2792,7 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host));
#if !defined(OS_ANDROID)
registry->AddService(
- base::Bind(&CreateWebUsbPermissionBubble, render_frame_host));
+ base::Bind(&CreateWebUsbChooserService, render_frame_host));
#endif // !defined(OS_ANDROID)
}
« no previous file with comments | « no previous file | chrome/browser/usb/usb_chooser_bubble_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698