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::DeviceManagerImpl::Create( | 41 device::usb::DeviceManagerImpl::Create( |
42 GetPermissionProvider(render_frame_host), std::move(request)); | 42 GetPermissionProvider(render_frame_host), std::move(request)); |
43 } | 43 } |
44 | 44 |
45 #if !defined(OS_ANDROID) | 45 #if !defined(OS_ANDROID) |
46 void UsbTabHelper::CreatePermissionBubble( | 46 void UsbTabHelper::CreateChooserService( |
47 content::RenderFrameHost* render_frame_host, | 47 content::RenderFrameHost* render_frame_host, |
48 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 48 mojo::InterfaceRequest<device::usb::ChooserService> request) { |
49 GetPermissionBubble(render_frame_host, std::move(request)); | 49 GetChooserService(render_frame_host, std::move(request)); |
50 } | 50 } |
51 #endif // !defined(OS_ANDROID) | 51 #endif // !defined(OS_ANDROID) |
52 | 52 |
53 UsbTabHelper::UsbTabHelper(WebContents* web_contents) | 53 UsbTabHelper::UsbTabHelper(WebContents* web_contents) |
54 : content::WebContentsObserver(web_contents) {} | 54 : content::WebContentsObserver(web_contents) {} |
55 | 55 |
56 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { | 56 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { |
57 frame_usb_services_.erase(render_frame_host); | 57 frame_usb_services_.erase(render_frame_host); |
58 } | 58 } |
59 | 59 |
(...skipping 14 matching lines...) Expand all Loading... |
74 UsbTabHelper::GetPermissionProvider(RenderFrameHost* render_frame_host) { | 74 UsbTabHelper::GetPermissionProvider(RenderFrameHost* render_frame_host) { |
75 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 75 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
76 if (!frame_usb_services->permission_provider) { | 76 if (!frame_usb_services->permission_provider) { |
77 frame_usb_services->permission_provider.reset( | 77 frame_usb_services->permission_provider.reset( |
78 new WebUSBPermissionProvider(render_frame_host)); | 78 new WebUSBPermissionProvider(render_frame_host)); |
79 } | 79 } |
80 return frame_usb_services->permission_provider->GetWeakPtr(); | 80 return frame_usb_services->permission_provider->GetWeakPtr(); |
81 } | 81 } |
82 | 82 |
83 #if !defined(OS_ANDROID) | 83 #if !defined(OS_ANDROID) |
84 void UsbTabHelper::GetPermissionBubble( | 84 void UsbTabHelper::GetChooserService( |
85 content::RenderFrameHost* render_frame_host, | 85 content::RenderFrameHost* render_frame_host, |
86 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 86 mojo::InterfaceRequest<device::usb::ChooserService> request) { |
87 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 87 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
88 if (!frame_usb_services->permission_bubble) { | 88 if (!frame_usb_services->chooser_service) { |
89 frame_usb_services->permission_bubble.reset( | 89 frame_usb_services->chooser_service.reset( |
90 new ChromeWebUsbPermissionBubble(render_frame_host)); | 90 new WebUsbChooserService(render_frame_host)); |
91 } | 91 } |
92 frame_usb_services->permission_bubble->Bind(std::move(request)); | 92 frame_usb_services->chooser_service->Bind(std::move(request)); |
93 } | 93 } |
94 #endif // !defined(OS_ANDROID) | 94 #endif // !defined(OS_ANDROID) |
OLD | NEW |