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

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

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.h
diff --git a/chrome/browser/usb/usb_tab_helper.h b/chrome/browser/usb/usb_tab_helper.h
index 7d4cec513ceb3f5bb92e6632be0b020ad505ec7d..44245fc8a6214597dad401a5e0a2f08ffd5189b1 100644
--- a/chrome/browser/usb/usb_tab_helper.h
+++ b/chrome/browser/usb/usb_tab_helper.h
@@ -12,6 +12,10 @@
#include "content/public/browser/web_contents_user_data.h"
#include "mojo/public/cpp/bindings/interface_request.h"
+namespace content {
+class WebUsbPermissionRequest;
+}
+
namespace device {
namespace usb {
class DeviceManager;
@@ -19,10 +23,6 @@ class PermissionProvider;
}
}
-namespace webusb {
-class WebUsbPermissionBubble;
-}
-
struct FrameUsbServices;
typedef std::map<content::RenderFrameHost*, scoped_ptr<FrameUsbServices>>
@@ -41,9 +41,9 @@ class UsbTabHelper : public content::WebContentsObserver,
content::RenderFrameHost* render_frame_host,
mojo::InterfaceRequest<device::usb::DeviceManager> request);
- void CreatePermissionBubble(
+ void CreatePermissionRequest(
content::RenderFrameHost* render_frame_host,
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request);
+ mojo::InterfaceRequest<content::WebUsbPermissionRequest> request);
private:
explicit UsbTabHelper(content::WebContents* web_contents);
@@ -59,9 +59,9 @@ class UsbTabHelper : public content::WebContentsObserver,
content::RenderFrameHost* render_frame_host,
mojo::InterfaceRequest<device::usb::PermissionProvider> request);
- void GetPermissionBubble(
+ void GetPermissionRequest(
content::RenderFrameHost* render_frame_host,
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request);
+ mojo::InterfaceRequest<content::WebUsbPermissionRequest> request);
FrameUsbServicesMap frame_usb_services_;

Powered by Google App Engine
This is Rietveld 408576698