| Index: chrome/browser/usb/web_usb_permission_request.h
|
| diff --git a/chrome/browser/usb/web_usb_permission_bubble.h b/chrome/browser/usb/web_usb_permission_request.h
|
| similarity index 51%
|
| rename from chrome/browser/usb/web_usb_permission_bubble.h
|
| rename to chrome/browser/usb/web_usb_permission_request.h
|
| index 1824754172d76ec15e4596fe652efdc49d850760..bd41b59cc51299bdcfa26f2ede8ab47577e99ad3 100644
|
| --- a/chrome/browser/usb/web_usb_permission_bubble.h
|
| +++ b/chrome/browser/usb/web_usb_permission_request.h
|
| @@ -1,15 +1,15 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_USB_WEB_USB_PERMISSION_BUBBLE_H_
|
| -#define CHROME_BROWSER_USB_WEB_USB_PERMISSION_BUBBLE_H_
|
| +#ifndef CHROME_BROWSER_USB_WEB_USB_PERMISSION_REQUEST_H_
|
| +#define CHROME_BROWSER_USB_WEB_USB_PERMISSION_REQUEST_H_
|
|
|
| #include <vector>
|
|
|
| #include "base/macros.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 "mojo/common/weak_binding_set.h"
|
| #include "mojo/public/cpp/bindings/array.h"
|
| #include "mojo/public/cpp/bindings/interface_request.h"
|
| @@ -22,27 +22,27 @@ namespace device {
|
| class UsbDevice;
|
| }
|
|
|
| -// Implementation of the public webusb::WebUsbPermissionBubble interface.
|
| +// Implementation of the public content::WebUsbPermissionRequest interface.
|
| // This interface can be used by a webpage to request permission from user
|
| // to access a certain device.
|
| -class ChromeWebUsbPermissionBubble : public webusb::WebUsbPermissionBubble {
|
| +class ChromeWebUsbPermissionRequest : public content::WebUsbPermissionRequest {
|
| public:
|
| - explicit ChromeWebUsbPermissionBubble(
|
| + explicit ChromeWebUsbPermissionRequest(
|
| content::RenderFrameHost* render_frame_host);
|
|
|
| - ~ChromeWebUsbPermissionBubble() override;
|
| + ~ChromeWebUsbPermissionRequest() override;
|
|
|
| - // webusb::WebUsbPermissionBubble:
|
| + // content::WebUsbPermissionRequest:
|
| void GetPermission(mojo::Array<device::usb::DeviceFilterPtr> device_filters,
|
| const GetPermissionCallback& callback) override;
|
| - void Bind(mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request);
|
| + void Bind(mojo::InterfaceRequest<content::WebUsbPermissionRequest> request);
|
|
|
| private:
|
| content::RenderFrameHost* const render_frame_host_;
|
| - mojo::WeakBindingSet<webusb::WebUsbPermissionBubble> bindings_;
|
| + mojo::WeakBindingSet<content::WebUsbPermissionRequest> bindings_;
|
| std::vector<BubbleReference> bubbles_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ChromeWebUsbPermissionBubble);
|
| + DISALLOW_COPY_AND_ASSIGN(ChromeWebUsbPermissionRequest);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_USB_WEB_USB_PERMISSION_BUBBLE_H_
|
| +#endif // CHROME_BROWSER_USB_WEB_USB_PERMISSION_REQUEST_H_
|
|
|