OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_bubble.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" |
(...skipping 16 matching lines...) Expand all Loading... |
27 } | 27 } |
28 } | 28 } |
29 | 29 |
30 void ChromeWebUsbPermissionBubble::GetPermission( | 30 void ChromeWebUsbPermissionBubble::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(render_frame_host_, |
| 38 std::move(device_filters), |
38 render_frame_host_, callback)); | 39 render_frame_host_, callback)); |
39 UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get(); | 40 UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get(); |
40 BubbleReference bubble_controller = | 41 BubbleReference bubble_controller = |
41 browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate)); | 42 browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate)); |
42 bubble_delegate_ptr->set_bubble_controller(bubble_controller); | 43 bubble_delegate_ptr->set_bubble_controller(bubble_controller); |
43 bubbles_.push_back(bubble_controller); | 44 bubbles_.push_back(bubble_controller); |
44 } | 45 } |
45 | 46 |
46 void ChromeWebUsbPermissionBubble::Bind( | 47 void ChromeWebUsbPermissionBubble::Bind( |
47 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 48 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { |
48 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 49 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
49 bindings_.AddBinding(this, std::move(request)); | 50 bindings_.AddBinding(this, std::move(request)); |
50 } | 51 } |
OLD | NEW |