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/usb_tab_helper.h" | 5 #include "chrome/browser/usb/usb_tab_helper.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "chrome/browser/usb/web_usb_permission_bubble.h" | 10 #include "chrome/browser/usb/web_usb_chooser_service.h" |
11 #include "chrome/browser/usb/web_usb_permission_provider.h" | 11 #include "chrome/browser/usb/web_usb_permission_provider.h" |
12 #include "device/usb/mojo/device_manager_impl.h" | 12 #include "device/usb/mojo/device_manager_impl.h" |
13 | 13 |
14 using content::RenderFrameHost; | 14 using content::RenderFrameHost; |
15 using content::WebContents; | 15 using content::WebContents; |
16 | 16 |
17 DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper); | 17 DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper); |
18 | 18 |
19 struct FrameUsbServices { | 19 struct FrameUsbServices { |
20 scoped_ptr<WebUSBPermissionProvider> permission_provider; | 20 scoped_ptr<WebUSBPermissionProvider> permission_provider; |
21 scoped_ptr<ChromeWebUsbPermissionBubble> permission_bubble; | 21 scoped_ptr<WebUsbChooserService> chooser_service; |
22 }; | 22 }; |
23 | 23 |
24 // static | 24 // static |
25 UsbTabHelper* UsbTabHelper::GetOrCreateForWebContents( | 25 UsbTabHelper* UsbTabHelper::GetOrCreateForWebContents( |
26 WebContents* web_contents) { | 26 WebContents* web_contents) { |
27 UsbTabHelper* tab_helper = FromWebContents(web_contents); | 27 UsbTabHelper* tab_helper = FromWebContents(web_contents); |
28 if (!tab_helper) { | 28 if (!tab_helper) { |
29 CreateForWebContents(web_contents); | 29 CreateForWebContents(web_contents); |
30 tab_helper = FromWebContents(web_contents); | 30 tab_helper = FromWebContents(web_contents); |
31 } | 31 } |
32 return tab_helper; | 32 return tab_helper; |
33 } | 33 } |
34 | 34 |
35 UsbTabHelper::~UsbTabHelper() {} | 35 UsbTabHelper::~UsbTabHelper() {} |
36 | 36 |
37 void UsbTabHelper::CreateDeviceManager( | 37 void UsbTabHelper::CreateDeviceManager( |
38 RenderFrameHost* render_frame_host, | 38 RenderFrameHost* render_frame_host, |
39 mojo::InterfaceRequest<device::usb::DeviceManager> request) { | 39 mojo::InterfaceRequest<device::usb::DeviceManager> request) { |
40 DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents()); | 40 DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents()); |
41 device::usb::PermissionProviderPtr permission_provider; | 41 device::usb::PermissionProviderPtr permission_provider; |
42 GetPermissionProvider(render_frame_host, | 42 GetPermissionProvider(render_frame_host, |
43 mojo::GetProxy(&permission_provider)); | 43 mojo::GetProxy(&permission_provider)); |
44 device::usb::DeviceManagerImpl::Create(std::move(permission_provider), | 44 device::usb::DeviceManagerImpl::Create(std::move(permission_provider), |
45 std::move(request)); | 45 std::move(request)); |
46 } | 46 } |
47 | 47 |
48 #if !defined(OS_ANDROID) | 48 #if !defined(OS_ANDROID) |
49 void UsbTabHelper::CreatePermissionBubble( | 49 void UsbTabHelper::CreateChooserService( |
50 content::RenderFrameHost* render_frame_host, | 50 content::RenderFrameHost* render_frame_host, |
51 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 51 mojo::InterfaceRequest<device::ChooserService> request) { |
52 GetPermissionBubble(render_frame_host, std::move(request)); | 52 GetChooserService(render_frame_host, std::move(request)); |
53 } | 53 } |
54 #endif // !defined(OS_ANDROID) | 54 #endif // !defined(OS_ANDROID) |
55 | 55 |
56 UsbTabHelper::UsbTabHelper(WebContents* web_contents) | 56 UsbTabHelper::UsbTabHelper(WebContents* web_contents) |
57 : content::WebContentsObserver(web_contents) {} | 57 : content::WebContentsObserver(web_contents) {} |
58 | 58 |
59 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { | 59 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { |
60 frame_usb_services_.erase(render_frame_host); | 60 frame_usb_services_.erase(render_frame_host); |
61 } | 61 } |
62 | 62 |
(...skipping 15 matching lines...) Expand all Loading... |
78 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { | 78 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { |
79 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 79 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
80 if (!frame_usb_services->permission_provider) { | 80 if (!frame_usb_services->permission_provider) { |
81 frame_usb_services->permission_provider.reset( | 81 frame_usb_services->permission_provider.reset( |
82 new WebUSBPermissionProvider(render_frame_host)); | 82 new WebUSBPermissionProvider(render_frame_host)); |
83 } | 83 } |
84 frame_usb_services->permission_provider->Bind(std::move(request)); | 84 frame_usb_services->permission_provider->Bind(std::move(request)); |
85 } | 85 } |
86 | 86 |
87 #if !defined(OS_ANDROID) | 87 #if !defined(OS_ANDROID) |
88 void UsbTabHelper::GetPermissionBubble( | 88 void UsbTabHelper::GetChooserService( |
89 content::RenderFrameHost* render_frame_host, | 89 content::RenderFrameHost* render_frame_host, |
90 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 90 mojo::InterfaceRequest<device::ChooserService> request) { |
91 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 91 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
92 if (!frame_usb_services->permission_bubble) { | 92 if (!frame_usb_services->chooser_service) { |
93 frame_usb_services->permission_bubble.reset( | 93 frame_usb_services->chooser_service.reset( |
94 new ChromeWebUsbPermissionBubble(render_frame_host)); | 94 new WebUsbChooserService(render_frame_host)); |
95 } | 95 } |
96 frame_usb_services->permission_bubble->Bind(std::move(request)); | 96 frame_usb_services->chooser_service->Bind(std::move(request)); |
97 } | 97 } |
98 #endif // !defined(OS_ANDROID) | 98 #endif // !defined(OS_ANDROID) |
OLD | NEW |