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_chooser_service.h" | 5 #include "chrome/browser/usb/web_usb_chooser_service.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 11 matching lines...) Expand all Loading... |
22 } | 22 } |
23 | 23 |
24 WebUsbChooserService::~WebUsbChooserService() { | 24 WebUsbChooserService::~WebUsbChooserService() { |
25 for (const auto& bubble : bubbles_) { | 25 for (const auto& bubble : bubbles_) { |
26 if (bubble) | 26 if (bubble) |
27 bubble->CloseBubble(BUBBLE_CLOSE_FORCED); | 27 bubble->CloseBubble(BUBBLE_CLOSE_FORCED); |
28 } | 28 } |
29 } | 29 } |
30 | 30 |
31 void WebUsbChooserService::GetPermission( | 31 void WebUsbChooserService::GetPermission( |
32 std::vector<device::usb::DeviceFilterPtr> device_filters, | 32 const std::vector<device::UsbDeviceFilter>& device_filters, |
33 const GetPermissionCallback& callback) { | 33 const GetPermissionCallback& callback) { |
34 content::WebContents* web_contents = | 34 content::WebContents* web_contents = |
35 content::WebContents::FromRenderFrameHost(render_frame_host_); | 35 content::WebContents::FromRenderFrameHost(render_frame_host_); |
36 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); | 36 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); |
37 std::unique_ptr<UsbChooserController> usb_chooser_controller( | 37 std::unique_ptr<UsbChooserController> usb_chooser_controller( |
38 new UsbChooserController(render_frame_host_, device_filters, callback)); | 38 new UsbChooserController(render_frame_host_, device_filters, callback)); |
39 std::unique_ptr<ChooserBubbleDelegate> chooser_bubble_delegate( | 39 std::unique_ptr<ChooserBubbleDelegate> chooser_bubble_delegate( |
40 new ChooserBubbleDelegate(render_frame_host_, | 40 new ChooserBubbleDelegate(render_frame_host_, |
41 std::move(usb_chooser_controller))); | 41 std::move(usb_chooser_controller))); |
42 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( | 42 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( |
43 std::move(chooser_bubble_delegate)); | 43 std::move(chooser_bubble_delegate)); |
44 bubbles_.push_back(bubble_reference); | 44 bubbles_.push_back(bubble_reference); |
45 } | 45 } |
46 | 46 |
47 void WebUsbChooserService::Bind( | 47 void WebUsbChooserService::Bind( |
48 mojo::InterfaceRequest<device::usb::ChooserService> request) { | 48 mojo::InterfaceRequest<device::usb::ChooserService> request) { |
49 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 49 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
50 bindings_.AddBinding(this, std::move(request)); | 50 bindings_.AddBinding(this, std::move(request)); |
51 } | 51 } |
OLD | NEW |