| Index: chrome/browser/usb/web_usb_permission_request.cc
|
| diff --git a/chrome/browser/usb/web_usb_permission_bubble.cc b/chrome/browser/usb/web_usb_permission_request.cc
|
| similarity index 79%
|
| rename from chrome/browser/usb/web_usb_permission_bubble.cc
|
| rename to chrome/browser/usb/web_usb_permission_request.cc
|
| index d1f7a8f448efaac8db9987b27959f9f7709de893..4cd3932834c21939414f783a245deabce1de6805 100644
|
| --- a/chrome/browser/usb/web_usb_permission_bubble.cc
|
| +++ b/chrome/browser/usb/web_usb_permission_request.cc
|
| @@ -1,8 +1,8 @@
|
| -// 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.
|
|
|
| -#include "chrome/browser/usb/web_usb_permission_bubble.h"
|
| +#include "chrome/browser/usb/web_usb_permission_request.h"
|
|
|
| #include <utility>
|
|
|
| @@ -13,21 +13,21 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/render_frame_host.h"
|
|
|
| -ChromeWebUsbPermissionBubble::ChromeWebUsbPermissionBubble(
|
| +ChromeWebUsbPermissionRequest::ChromeWebUsbPermissionRequest(
|
| content::RenderFrameHost* render_frame_host)
|
| : render_frame_host_(render_frame_host) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| DCHECK(render_frame_host);
|
| }
|
|
|
| -ChromeWebUsbPermissionBubble::~ChromeWebUsbPermissionBubble() {
|
| +ChromeWebUsbPermissionRequest::~ChromeWebUsbPermissionRequest() {
|
| for (const auto& bubble : bubbles_) {
|
| if (bubble)
|
| bubble->CloseBubble(BUBBLE_CLOSE_FORCED);
|
| }
|
| }
|
|
|
| -void ChromeWebUsbPermissionBubble::GetPermission(
|
| +void ChromeWebUsbPermissionRequest::GetPermission(
|
| mojo::Array<device::usb::DeviceFilterPtr> device_filters,
|
| const GetPermissionCallback& callback) {
|
| content::WebContents* web_contents =
|
| @@ -43,8 +43,8 @@ void ChromeWebUsbPermissionBubble::GetPermission(
|
| bubbles_.push_back(bubble_controller);
|
| }
|
|
|
| -void ChromeWebUsbPermissionBubble::Bind(
|
| - mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
|
| +void ChromeWebUsbPermissionRequest::Bind(
|
| + mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| bindings_.AddBinding(this, std::move(request));
|
| }
|
|
|