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

Side by Side Diff: chrome/browser/android/usb/web_usb_chooser_service_android.cc

Issue 2615353002: Typemap device.usb.DeviceFilter to device::UsbDeviceFilter. (Closed)
Patch Set: Addressed juncai@'s feedback. Created 3 years, 11 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/android/usb/web_usb_chooser_service_android.h" 5 #include "chrome/browser/android/usb/web_usb_chooser_service_android.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h" 10 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 12
13 WebUsbChooserServiceAndroid::WebUsbChooserServiceAndroid( 13 WebUsbChooserServiceAndroid::WebUsbChooserServiceAndroid(
14 content::RenderFrameHost* render_frame_host) 14 content::RenderFrameHost* render_frame_host)
15 : render_frame_host_(render_frame_host) { 15 : render_frame_host_(render_frame_host) {
16 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 16 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
17 DCHECK(render_frame_host_); 17 DCHECK(render_frame_host_);
18 } 18 }
19 19
20 WebUsbChooserServiceAndroid::~WebUsbChooserServiceAndroid() {} 20 WebUsbChooserServiceAndroid::~WebUsbChooserServiceAndroid() {}
21 21
22 void WebUsbChooserServiceAndroid::GetPermission( 22 void WebUsbChooserServiceAndroid::GetPermission(
23 std::vector<device::usb::DeviceFilterPtr> device_filters, 23 const std::vector<device::UsbDeviceFilter>& device_filters,
24 const GetPermissionCallback& callback) { 24 const GetPermissionCallback& callback) {
25 usb_chooser_dialog_android_.push_back( 25 usb_chooser_dialog_android_.push_back(
26 base::MakeUnique<UsbChooserDialogAndroid>(std::move(device_filters), 26 base::MakeUnique<UsbChooserDialogAndroid>(device_filters,
27 render_frame_host_, callback)); 27 render_frame_host_, callback));
28 } 28 }
29 29
30 void WebUsbChooserServiceAndroid::Bind( 30 void WebUsbChooserServiceAndroid::Bind(
31 mojo::InterfaceRequest<device::usb::ChooserService> request) { 31 mojo::InterfaceRequest<device::usb::ChooserService> request) {
32 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 32 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
33 bindings_.AddBinding(this, std::move(request)); 33 bindings_.AddBinding(this, std::move(request));
34 } 34 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698