| 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_permission_bubble.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 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 void UsbTabHelper::CreatePermissionBubble( | 49 void UsbTabHelper::CreatePermissionBubble( |
| 49 content::RenderFrameHost* render_frame_host, | 50 content::RenderFrameHost* render_frame_host, |
| 50 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 51 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { |
| 51 GetPermissionBubble(render_frame_host, std::move(request)); | 52 GetPermissionBubble(render_frame_host, std::move(request)); |
| 52 } | 53 } |
| 54 #endif // !defined(OS_ANDROID) |
| 53 | 55 |
| 54 UsbTabHelper::UsbTabHelper(WebContents* web_contents) | 56 UsbTabHelper::UsbTabHelper(WebContents* web_contents) |
| 55 : content::WebContentsObserver(web_contents) {} | 57 : content::WebContentsObserver(web_contents) {} |
| 56 | 58 |
| 57 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { | 59 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { |
| 58 frame_usb_services_.erase(render_frame_host); | 60 frame_usb_services_.erase(render_frame_host); |
| 59 } | 61 } |
| 60 | 62 |
| 61 FrameUsbServices* UsbTabHelper::GetFrameUsbService( | 63 FrameUsbServices* UsbTabHelper::GetFrameUsbService( |
| 62 content::RenderFrameHost* render_frame_host) { | 64 content::RenderFrameHost* render_frame_host) { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 75 RenderFrameHost* render_frame_host, | 77 RenderFrameHost* render_frame_host, |
| 76 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { | 78 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { |
| 77 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 79 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
| 78 if (!frame_usb_services->permission_provider) { | 80 if (!frame_usb_services->permission_provider) { |
| 79 frame_usb_services->permission_provider.reset( | 81 frame_usb_services->permission_provider.reset( |
| 80 new WebUSBPermissionProvider(render_frame_host)); | 82 new WebUSBPermissionProvider(render_frame_host)); |
| 81 } | 83 } |
| 82 frame_usb_services->permission_provider->Bind(std::move(request)); | 84 frame_usb_services->permission_provider->Bind(std::move(request)); |
| 83 } | 85 } |
| 84 | 86 |
| 87 #if !defined(OS_ANDROID) |
| 85 void UsbTabHelper::GetPermissionBubble( | 88 void UsbTabHelper::GetPermissionBubble( |
| 86 content::RenderFrameHost* render_frame_host, | 89 content::RenderFrameHost* render_frame_host, |
| 87 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 90 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { |
| 88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); | 91 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); |
| 89 if (!frame_usb_services->permission_bubble) { | 92 if (!frame_usb_services->permission_bubble) { |
| 90 frame_usb_services->permission_bubble.reset( | 93 frame_usb_services->permission_bubble.reset( |
| 91 new ChromeWebUsbPermissionBubble(render_frame_host)); | 94 new ChromeWebUsbPermissionBubble(render_frame_host)); |
| 92 } | 95 } |
| 93 frame_usb_services->permission_bubble->Bind(std::move(request)); | 96 frame_usb_services->permission_bubble->Bind(std::move(request)); |
| 94 } | 97 } |
| 98 #endif // !defined(OS_ANDROID) |
| OLD | NEW |