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

Unified Diff: chrome/browser/usb/usb_tab_helper.cc

Issue 1624573004: Rename webusb_permission_bubble.mojom and move it to //content/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added content_common_mojo_bindings dep back to chrome_browser.gypi Created 4 years, 11 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: chrome/browser/usb/usb_tab_helper.cc
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index b6aa2b7d369b048364ded1b2026964c592333b27..706e53c03f956de358a8c235e95809fe964ee2ec 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/usb/web_usb_permission_bubble.h"
#include "chrome/browser/usb/web_usb_permission_provider.h"
+#include "chrome/browser/usb/web_usb_permission_request.h"
#include "device/devices_app/usb/device_manager_impl.h"
using content::RenderFrameHost;
@@ -18,7 +18,7 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper);
struct FrameUsbServices {
scoped_ptr<WebUSBPermissionProvider> permission_provider;
- scoped_ptr<ChromeWebUsbPermissionBubble> permission_bubble;
+ scoped_ptr<ChromeWebUsbPermissionRequest> permission_request;
};
// static
@@ -45,10 +45,10 @@ void UsbTabHelper::CreateDeviceManager(
std::move(request));
}
-void UsbTabHelper::CreatePermissionBubble(
+void UsbTabHelper::CreatePermissionRequest(
content::RenderFrameHost* render_frame_host,
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
- GetPermissionBubble(render_frame_host, std::move(request));
+ mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) {
+ GetPermissionRequest(render_frame_host, std::move(request));
}
UsbTabHelper::UsbTabHelper(WebContents* web_contents)
@@ -82,13 +82,13 @@ void UsbTabHelper::GetPermissionProvider(
frame_usb_services->permission_provider->Bind(std::move(request));
}
-void UsbTabHelper::GetPermissionBubble(
+void UsbTabHelper::GetPermissionRequest(
content::RenderFrameHost* render_frame_host,
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
+ mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) {
FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
- if (!frame_usb_services->permission_bubble) {
- frame_usb_services->permission_bubble.reset(
- new ChromeWebUsbPermissionBubble(render_frame_host));
+ if (!frame_usb_services->permission_request) {
+ frame_usb_services->permission_request.reset(
+ new ChromeWebUsbPermissionRequest(render_frame_host));
}
- frame_usb_services->permission_bubble->Bind(std::move(request));
+ frame_usb_services->permission_request->Bind(std::move(request));
}

Powered by Google App Engine
This is Rietveld 408576698