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

Unified Diff: media/capture.gypi

Issue 2005753006: ImageCapture: ScopedResultCallback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: miu@s comments Created 4 years, 7 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
Index: media/capture.gypi
diff --git a/media/capture.gypi b/media/capture.gypi
index 071a06293811cb7036a7766bcc8d458d8a98d520..c98182511cb7d09bcaf5a9a93cece292086db753 100644
--- a/media/capture.gypi
+++ b/media/capture.gypi
@@ -16,10 +16,10 @@
'capture/content/feedback_signal_accumulator.h',
'capture/content/screen_capture_device_core.cc',
'capture/content/screen_capture_device_core.h',
- 'capture/content/thread_safe_capture_oracle.cc',
- 'capture/content/thread_safe_capture_oracle.h',
'capture/content/smooth_event_sampler.cc',
'capture/content/smooth_event_sampler.h',
+ 'capture/content/thread_safe_capture_oracle.cc',
+ 'capture/content/thread_safe_capture_oracle.h',
'capture/content/video_capture_oracle.cc',
'capture/content/video_capture_oracle.h',
'capture/device_monitor_mac.h',
@@ -54,6 +54,7 @@
'capture/video/mac/video_capture_device_factory_mac.mm',
'capture/video/mac/video_capture_device_mac.h',
'capture/video/mac/video_capture_device_mac.mm',
+ 'capture/video/scoped_callback.h',
'capture/video/video_capture_device.cc',
'capture/video/video_capture_device.h',
'capture/video/video_capture_device_factory.cc',
@@ -86,9 +87,9 @@
'capture/content/feedback_signal_accumulator_unittest.cc',
'capture/content/smooth_event_sampler_unittest.cc',
'capture/content/video_capture_oracle_unittest.cc',
+ 'capture/system_message_window_win_unittest.cc',
'capture/video/fake_video_capture_device_unittest.cc',
'capture/video/mac/video_capture_device_factory_mac_unittest.mm',
- 'capture/system_message_window_win_unittest.cc',
'capture/video/video_capture_device_unittest.cc'
],

Powered by Google App Engine
This is Rietveld 408576698