chrome/browser/usb/usb_chooser_bubble_delegate.h - Issue 1624573004: Rename webusb_permission_bubble.mojom and move it to //content/public

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/usb/usb_chooser_bubble_delegate.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

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/usb/usb_chooser_bubble_delegate.cc » ('j') | content/content_common_mojo_bindings.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/usb/usb_chooser_bubble_delegate.h

diff --git a/chrome/browser/usb/usb_chooser_bubble_delegate.h b/chrome/browser/usb/usb_chooser_bubble_delegate.h

index af4526b162b7f6f66d28043e5f40cf1d4dba4af5..60991399685429b67d07194d191882d7245ed91b 100644

--- a/chrome/browser/usb/usb_chooser_bubble_delegate.h

+++ b/chrome/browser/usb/usb_chooser_bubble_delegate.h

@@ -13,7 +13,7 @@

#include "base/scoped_observer.h"

#include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"

#include "components/bubble/bubble_reference.h"

-#include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"

+#include "content/public/common/web_usb_permission_request.mojom.h"

#include "device/usb/usb_service.h"

#include "mojo/public/cpp/bindings/array.h"

@@ -36,7 +36,7 @@ class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,

Browser* browser,

mojo::Array<device::usb::DeviceFilterPtr> device_filters,

content::RenderFrameHost* render_frame_host,

- const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback);

+ const content::WebUsbPermissionRequest::GetPermissionCallback& callback);

~UsbChooserBubbleDelegate() override;

// ChooserBubbleDelegate:

@@ -57,7 +57,7 @@ class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,

private:

content::RenderFrameHost* const render_frame_host_;

- webusb::WebUsbPermissionBubble::GetPermissionCallback callback_;

+ content::WebUsbPermissionRequest::GetPermissionCallback callback_;

ScopedObserver<device::UsbService, device::UsbService::Observer>

usb_service_observer_;

std::vector<device::UsbDeviceFilter> filters_;