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

Side by Side Diff: content/renderer/usb/web_usb_device_impl.cc

Issue 1682363002: Remove //device/devices_app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove two files that somehow survived in //device/devices_app. Created 4 years, 10 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
« no previous file with comments | « content/renderer/usb/web_usb_device_impl.h ('k') | device/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/usb/web_usb_device_impl.h" 5 #include "content/renderer/usb/web_usb_device_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "content/child/mojo/type_converters.h" 12 #include "content/child/mojo/type_converters.h"
13 #include "content/child/scoped_web_callbacks.h" 13 #include "content/child/scoped_web_callbacks.h"
14 #include "content/renderer/usb/type_converters.h" 14 #include "content/renderer/usb/type_converters.h"
15 #include "device/devices_app/public/cpp/constants.h"
16 #include "mojo/shell/public/cpp/connect.h" 15 #include "mojo/shell/public/cpp/connect.h"
17 #include "mojo/shell/public/interfaces/shell.mojom.h" 16 #include "mojo/shell/public/interfaces/shell.mojom.h"
18 #include "third_party/WebKit/public/platform/WebVector.h" 17 #include "third_party/WebKit/public/platform/WebVector.h"
19 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h" 18 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
20 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBTransferInfo.h " 19 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBTransferInfo.h "
21 20
22 namespace content { 21 namespace content {
23 22
24 namespace { 23 namespace {
25 24
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 } 395 }
397 396
398 void WebUSBDeviceImpl::reset(blink::WebUSBDeviceResetCallbacks* callbacks) { 397 void WebUSBDeviceImpl::reset(blink::WebUSBDeviceResetCallbacks* callbacks) {
399 auto scoped_callbacks = MakeScopedUSBCallbacks(callbacks); 398 auto scoped_callbacks = MakeScopedUSBCallbacks(callbacks);
400 device_->Reset(base::Bind(&HandlePassFailDeviceOperation, 399 device_->Reset(base::Bind(&HandlePassFailDeviceOperation,
401 base::Passed(&scoped_callbacks), 400 base::Passed(&scoped_callbacks),
402 kDeviceResetFailed)); 401 kDeviceResetFailed));
403 } 402 }
404 403
405 } // namespace content 404 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/usb/web_usb_device_impl.h ('k') | device/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698