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" | |
11 #include "chrome/browser/usb/web_usb_permission_provider.h" | 10 #include "chrome/browser/usb/web_usb_permission_provider.h" |
| 11 #include "chrome/browser/usb/web_usb_permission_request.h" |
12 #include "device/devices_app/usb/device_manager_impl.h" | 12 #include "device/devices_app/usb/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<ChromeWebUsbPermissionRequest> permission_request; |
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 void UsbTabHelper::CreatePermissionBubble( | 48 void UsbTabHelper::CreatePermissionRequest( |
49 content::RenderFrameHost* render_frame_host, | 49 content::RenderFrameHost* render_frame_host, |
50 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 50 mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) { |
51 GetPermissionBubble(render_frame_host, std::move(request)); | 51 GetPermissionRequest(render_frame_host, std::move(request)); |
52 } | 52 } |
53 | 53 |
54 UsbTabHelper::UsbTabHelper(WebContents* web_contents) | 54 UsbTabHelper::UsbTabHelper(WebContents* web_contents) |
55 : content::WebContentsObserver(web_contents) {} | 55 : content::WebContentsObserver(web_contents) {} |
56 | 56 |
57 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { | 57 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { |
58 frame_usb_services_.erase(render_frame_host); | 58 frame_usb_services_.erase(render_frame_host); |
59 } | 59 } |
60 | 60 |
61 FrameUsbServices* UsbTabHelper::GetFrameUsbService( | 61 FrameUsbServices* UsbTabHelper::GetFrameUsbService( |
(...skipping 13 matching lines...) Expand all Loading... |
75 RenderFrameHost* render_frame_host, | 75 RenderFrameHost* render_frame_host, |
76 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { | 76 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { |
77 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 77 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
78 if (!frame_usb_services->permission_provider) { | 78 if (!frame_usb_services->permission_provider) { |
79 frame_usb_services->permission_provider.reset( | 79 frame_usb_services->permission_provider.reset( |
80 new WebUSBPermissionProvider(render_frame_host)); | 80 new WebUSBPermissionProvider(render_frame_host)); |
81 } | 81 } |
82 frame_usb_services->permission_provider->Bind(std::move(request)); | 82 frame_usb_services->permission_provider->Bind(std::move(request)); |
83 } | 83 } |
84 | 84 |
85 void UsbTabHelper::GetPermissionBubble( | 85 void UsbTabHelper::GetPermissionRequest( |
86 content::RenderFrameHost* render_frame_host, | 86 content::RenderFrameHost* render_frame_host, |
87 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 87 mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) { |
88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
89 if (!frame_usb_services->permission_bubble) { | 89 if (!frame_usb_services->permission_request) { |
90 frame_usb_services->permission_bubble.reset( | 90 frame_usb_services->permission_request.reset( |
91 new ChromeWebUsbPermissionBubble(render_frame_host)); | 91 new ChromeWebUsbPermissionRequest(render_frame_host)); |
92 } | 92 } |
93 frame_usb_services->permission_bubble->Bind(std::move(request)); | 93 frame_usb_services->permission_request->Bind(std::move(request)); |
94 } | 94 } |
OLD | NEW |