12 commits

Author	SHA1	Message	Date
Samuel Attard	558fff69e7	chore: update to standard 12	2018-09-14 14:57:01 +10:00
Andrew MacDonald	6bfb122cd1	Add a display_id parameter to the desktopCapturer API. (#12417) ... * Add a screen_api_id parameter to the desktopCapturer API. When using the DirectX capturer on Windows, there was previously no way to associate desktopCapturer/getUserMedia and electron.screen API screens. This new parameter provides the association. * Fix non-Windows build. * Fix Mac. * Fix Mac harder. * JS lint * clang-format C++ code. * IWYU * display_id, Linux comment, better test * lint * Fix tests on Linux. * Add display_id documentation.	2018-04-09 14:43:35 +09:00
Shelley Vohr	7593bec687	update reviewed items	2017-10-24 19:36:06 -04:00
Shelley Vohr	98df153750	convert to map and remove shift param	2017-10-24 15:47:09 -04:00
Shelley Vohr	491a00fd84	clean main process desktop_capturer	2017-10-24 12:49:37 -04:00
Kevin Sawicki	cc7395eea8	Remove returns from event listeners	2016-05-19 15:28:08 -07:00
Cheng Zhao	fd432ddbc9	Fix the toDataUrl call in desktopCapturer	2016-05-06 10:12:56 -07:00
Kevin Sawicki	8d8d5878a3	Rename ATOM_ ipc event prefix to ELECTRON_	2016-04-07 09:04:55 -07:00
Zeke Sikelianos	2c3cacdc08	standardize by hand	2016-03-30 17:00:33 -07:00
Zeke Sikelianos	4794385fac	first pass at standardizing; suite still passing!	2016-03-30 17:00:30 -07:00
Kevin Sawicki	2d32956903	Destructure objects	2016-03-22 13:11:42 -07:00
Kevin Sawicki	70aa9b06ee	Move JavaScript to root lib/ folder	2016-03-08 11:14:21 -08:00

Renamed from atom/browser/lib/desktop-capturer.js (Browse further)