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

Side by Side Diff: content/renderer/usb/type_converters.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/render_thread_impl.cc ('k') | content/renderer/usb/web_usb_client_impl.cc » ('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 "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h" 5 #include "mojo/public/cpp/bindings/type_converter.h"
6 6
7 #include "device/devices_app/usb/public/interfaces/device.mojom.h" 7 #include "device/devices_app/usb/public/interfaces/device.mojom.h"
8 #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h" 8 #include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
9 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDevice.h" 9 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDevice.h"
10 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceFilter.h " 10 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceFilter.h "
11 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h" 11 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
12 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceRequestO ptions.h" 12 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceRequestO ptions.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 15
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 }; 96 };
97 97
98 template <> 98 template <>
99 struct TypeConverter<device::usb::EnumerationOptionsPtr, 99 struct TypeConverter<device::usb::EnumerationOptionsPtr,
100 blink::WebUSBDeviceRequestOptions> { 100 blink::WebUSBDeviceRequestOptions> {
101 static device::usb::EnumerationOptionsPtr Convert( 101 static device::usb::EnumerationOptionsPtr Convert(
102 const blink::WebUSBDeviceRequestOptions& web_options); 102 const blink::WebUSBDeviceRequestOptions& web_options);
103 }; 103 };
104 104
105 } // namespace mojo 105 } // namespace mojo
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/usb/web_usb_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698