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

Side by Side Diff: chrome/browser/usb/web_usb_permission_request.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: changed content/content_common_mojo_bindings.gyp again Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/usb/web_usb_permission_bubble.h" 5 #include "chrome/browser/usb/web_usb_permission_request.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/chrome_bubble_manager.h" 10 #include "chrome/browser/ui/chrome_bubble_manager.h"
11 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h" 11 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
12 #include "components/bubble/bubble_controller.h" 12 #include "components/bubble/bubble_controller.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/render_frame_host.h" 14 #include "content/public/browser/render_frame_host.h"
15 15
16 ChromeWebUsbPermissionBubble::ChromeWebUsbPermissionBubble( 16 ChromeWebUsbPermissionRequest::ChromeWebUsbPermissionRequest(
17 content::RenderFrameHost* render_frame_host) 17 content::RenderFrameHost* render_frame_host)
18 : render_frame_host_(render_frame_host) { 18 : render_frame_host_(render_frame_host) {
19 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 19 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
20 DCHECK(render_frame_host); 20 DCHECK(render_frame_host);
21 } 21 }
22 22
23 ChromeWebUsbPermissionBubble::~ChromeWebUsbPermissionBubble() { 23 ChromeWebUsbPermissionRequest::~ChromeWebUsbPermissionRequest() {
24 for (const auto& bubble : bubbles_) { 24 for (const auto& bubble : bubbles_) {
25 if (bubble) 25 if (bubble)
26 bubble->CloseBubble(BUBBLE_CLOSE_FORCED); 26 bubble->CloseBubble(BUBBLE_CLOSE_FORCED);
27 } 27 }
28 } 28 }
29 29
30 void ChromeWebUsbPermissionBubble::GetPermission( 30 void ChromeWebUsbPermissionRequest::GetPermission(
31 mojo::Array<device::usb::DeviceFilterPtr> device_filters, 31 mojo::Array<device::usb::DeviceFilterPtr> device_filters,
32 const GetPermissionCallback& callback) { 32 const GetPermissionCallback& callback) {
33 content::WebContents* web_contents = 33 content::WebContents* web_contents =
34 content::WebContents::FromRenderFrameHost(render_frame_host_); 34 content::WebContents::FromRenderFrameHost(render_frame_host_);
35 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); 35 Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
36 scoped_ptr<UsbChooserBubbleDelegate> bubble_delegate( 36 scoped_ptr<UsbChooserBubbleDelegate> bubble_delegate(
37 new UsbChooserBubbleDelegate(browser, std::move(device_filters), 37 new UsbChooserBubbleDelegate(browser, std::move(device_filters),
38 render_frame_host_, callback)); 38 render_frame_host_, callback));
39 UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get(); 39 UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get();
40 BubbleReference bubble_controller = 40 BubbleReference bubble_controller =
41 browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate)); 41 browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate));
42 bubble_delegate_ptr->set_bubble_controller(bubble_controller); 42 bubble_delegate_ptr->set_bubble_controller(bubble_controller);
43 bubbles_.push_back(bubble_controller); 43 bubbles_.push_back(bubble_controller);
44 } 44 }
45 45
46 void ChromeWebUsbPermissionBubble::Bind( 46 void ChromeWebUsbPermissionRequest::Bind(
47 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { 47 mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) {
48 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 48 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
49 bindings_.AddBinding(this, std::move(request)); 49 bindings_.AddBinding(this, std::move(request));
50 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698