Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: chrome/browser/usb/usb_tab_helper.cc

Issue 1739523002: WebUsb Android chooser UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_chooser_service.h" 10 #include "chrome/browser/usb/web_usb_chooser_service.h"
(...skipping 27 matching lines...) Expand all
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)
49 void UsbTabHelper::CreateChooserService( 48 void UsbTabHelper::CreateChooserService(
50 content::RenderFrameHost* render_frame_host, 49 content::RenderFrameHost* render_frame_host,
51 mojo::InterfaceRequest<device::usb::ChooserService> request) { 50 mojo::InterfaceRequest<device::usb::ChooserService> request) {
52 GetChooserService(render_frame_host, std::move(request)); 51 GetChooserService(render_frame_host, std::move(request));
53 } 52 }
54 #endif // !defined(OS_ANDROID)
55 53
56 UsbTabHelper::UsbTabHelper(WebContents* web_contents) 54 UsbTabHelper::UsbTabHelper(WebContents* web_contents)
57 : content::WebContentsObserver(web_contents) {} 55 : content::WebContentsObserver(web_contents) {}
58 56
59 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { 57 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) {
60 frame_usb_services_.erase(render_frame_host); 58 frame_usb_services_.erase(render_frame_host);
61 } 59 }
62 60
63 FrameUsbServices* UsbTabHelper::GetFrameUsbService( 61 FrameUsbServices* UsbTabHelper::GetFrameUsbService(
64 content::RenderFrameHost* render_frame_host) { 62 content::RenderFrameHost* render_frame_host) {
(...skipping 12 matching lines...) Expand all
77 RenderFrameHost* render_frame_host, 75 RenderFrameHost* render_frame_host,
78 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { 76 mojo::InterfaceRequest<device::usb::PermissionProvider> request) {
79 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 77 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
80 if (!frame_usb_services->permission_provider) { 78 if (!frame_usb_services->permission_provider) {
81 frame_usb_services->permission_provider.reset( 79 frame_usb_services->permission_provider.reset(
82 new WebUSBPermissionProvider(render_frame_host)); 80 new WebUSBPermissionProvider(render_frame_host));
83 } 81 }
84 frame_usb_services->permission_provider->Bind(std::move(request)); 82 frame_usb_services->permission_provider->Bind(std::move(request));
85 } 83 }
86 84
87 #if !defined(OS_ANDROID)
88 void UsbTabHelper::GetChooserService( 85 void UsbTabHelper::GetChooserService(
89 content::RenderFrameHost* render_frame_host, 86 content::RenderFrameHost* render_frame_host,
90 mojo::InterfaceRequest<device::usb::ChooserService> request) { 87 mojo::InterfaceRequest<device::usb::ChooserService> request) {
91 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
92 if (!frame_usb_services->chooser_service) { 89 if (!frame_usb_services->chooser_service) {
93 frame_usb_services->chooser_service.reset( 90 frame_usb_services->chooser_service.reset(
94 new WebUsbChooserService(render_frame_host)); 91 new WebUsbChooserService(render_frame_host));
95 } 92 }
96 frame_usb_services->chooser_service->Bind(std::move(request)); 93 frame_usb_services->chooser_service->Bind(std::move(request));
97 } 94 }
98 #endif // !defined(OS_ANDROID)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698