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

Unified Diff: content/content_renderer.gypi

Issue 1293253002: Connect WebUSB client interface to the devices app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix memory leak in WeakBindingSet Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_child.gypi ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index b02987a1fe3386a05b9a35fd1a24bffc911654aa..92131b539f830dc20476ae01b68a558b6dc5f266 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -19,6 +19,7 @@
'../jingle/jingle.gyp:jingle_glue',
'../media/blink/media_blink.gyp:media_blink',
'../media/media.gyp:media',
+ '../mojo/mojo_base.gyp:mojo_application_bindings',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../mojo/mojo_base.gyp:mojo_geometry_lib',
'../mojo/mojo_base.gyp:mojo_url_type_converters',
@@ -413,6 +414,12 @@
'renderer/stats_collection_observer.h',
'renderer/text_input_client_observer.cc',
'renderer/text_input_client_observer.h',
+ 'renderer/usb/type_converters.cc',
+ 'renderer/usb/type_converters.h',
+ 'renderer/usb/web_usb_client_impl.cc',
+ 'renderer/usb/web_usb_client_impl.h',
+ 'renderer/usb/web_usb_device_impl.cc',
+ 'renderer/usb/web_usb_device_impl.h',
'renderer/web_ui_extension.cc',
'renderer/web_ui_extension.h',
'renderer/web_ui_extension_data.cc',
@@ -746,6 +753,12 @@
['OS=="android"', {
'sources!': [
'renderer/media/audio_decoder.cc',
+ 'renderer/usb/type_converters.cc',
+ 'renderer/usb/type_converters.h',
+ 'renderer/usb/web_usb_client_impl.cc',
+ 'renderer/usb/web_usb_client_impl.h',
+ 'renderer/usb/web_usb_device_impl.cc',
+ 'renderer/usb/web_usb_device_impl.h',
],
'sources': [
'renderer/external_popup_menu.cc',
@@ -767,6 +780,8 @@
'renderer/java/gin_java_function_invocation_helper.h',
],
'dependencies': [
+ '../device/devices_app/devices_app.gyp:device_usb_mojo_bindings_lib',
+ '../device/devices_app/devices_app.gyp:devices_app_public_cpp',
'../media/cast/cast.gyp:cast_sender',
]
}],
« no previous file with comments | « content/content_child.gypi ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698