Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	b57665330c
						 | 
						
							
							
								
								
								Merge branch 'master' into chrome52
							
							
							
							
							
						 | 
						
							2016-07-21 05:34:36 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	59e44c13e0
						 | 
						
							
							
								
								
								Remove unused using decls.
							
							
							
							
							
						 | 
						
							2016-07-09 22:23:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	381689d3ed
						 | 
						
							
							
								
								
								Fix building on Windows
							
							
							
							
							
						 | 
						
							2016-07-05 09:31:29 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	1ba3907038
						 | 
						
							
							
								
								
								Update to API changes of Chrome 52
							
							
							
							
							
						 | 
						
							2016-07-04 15:32:43 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	44651656dd
						 | 
						
							
							
								
								
								Fix building on Windows
							
							
							
							
							
						 | 
						
							2016-05-23 16:39:19 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	a2bd55dd3c
						 | 
						
							
							
								
								
								Adapt to changes of Chrome 51 API changes (Part 2)
							
							
							
							
							
						 | 
						
							2016-05-23 12:29:14 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	9ccb495f60
						 | 
						
							
							
								
								
								Do not remove the patch for Command key
							
							
							
							
							
						 | 
						
							2016-05-13 11:11:50 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian R. Bondy
								
							 
						 | 
						
							
							
								
							
							
	a52dbf0784
						 | 
						
							
							
								
								
								Update SharedMemory buf constructor
							
							
							
							
							
						 | 
						
							2016-05-13 11:07:17 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian R. Bondy
								
							 
						 | 
						
							
							
								
							
							
	37ccd34a88
						 | 
						
							
							
								
								
								Update x11 global shortcut listeners
							
							
							
							
							
						 | 
						
							2016-05-13 11:07:17 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian R. Bondy
								
							 
						 | 
						
							
							
								
							
							
	ce7c1023d5
						 | 
						
							
							
								
								
								Minimum fixes needed for chromium_src
							
							
							
							
							
						 | 
						
							2016-05-13 11:07:17 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian R. Bondy
								
							 
						 | 
						
							
							
								
							
							
	2da39d31aa
						 | 
						
							
							
								
								
								Update to new pref service location in components
							
							
							
							
							
						 | 
						
							2016-05-13 11:07:17 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	4435cdc576
						 | 
						
							
							
								
								
								Create user_data_dir before creating singleton lock
							
							
							
							
							
						 | 
						
							2016-04-27 21:52:50 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	0900762507
						 | 
						
							
							
								
								
								Make the length of SingletonSocket's path as short as we can
							
							
							
							
							
						 | 
						
							2016-04-21 13:58:11 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									deepak1556
								
							 
						 | 
						
							
							
								
							
							
	1240c83e40
						 | 
						
							
							
								
								
								set trust bits for CA certs
							
							
							
							
							
						 | 
						
							2016-04-18 21:05:33 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									deepak1556
								
							 
						 | 
						
							
							
								
							
							
	e81cec4058
						 | 
						
							
							
								
								
								app: api to import client certificate
							
							
							
							
							
						 | 
						
							2016-04-18 10:54:43 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	cadd1969d9
						 | 
						
							
							
								
								
								Fix compilation errors on Windows
							
							
							
							
							
						 | 
						
							2016-03-10 17:06:23 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	e3af5de7d7
						 | 
						
							
							
								
								
								Update pdf_to_emf_converter
							
							
							
							
							
						 | 
						
							2016-03-10 17:06:23 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	e835111195
						 | 
						
							
							
								
								
								More type fixups
							
							
							
							
							
						 | 
						
							2016-03-10 17:06:22 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	a737baafbf
						 | 
						
							
							
								
								
								We don't need Metro
							
							
							
							
							
						 | 
						
							2016-03-10 17:06:22 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	d36b8bca86
						 | 
						
							
							
								
								
								Fix compilation errors on Linux
							
							
							
							
							
						 | 
						
							2016-03-10 17:06:22 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	5fae63a2f5
						 | 
						
							
							
								
								
								Fix compilation errors on OS X
							
							
							
							
							
						 | 
						
							2016-03-10 17:06:21 +09:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dongjoon Hyun
								
							 
						 | 
						
							
							
								
							
							
	0c92d44077
						 | 
						
							
							
								
								
								Fix typos in comments.
							
							
							
							
							
						 | 
						
							2016-03-07 20:22:03 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	57da8908b2
						 | 
						
							
							
								
								
								Use volume serial number as device id
							
							
							
							
							
						 | 
						
							2016-01-12 23:17:07 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	8832d7b77b
						 | 
						
							
							
								
								
								Import PepperFlashDRMHost class
							
							
							
							
							
						 | 
						
							2016-01-12 22:17:24 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	c76db0ba1d
						 | 
						
							
							
								
								
								Fix coding styles
							
							
							
							
							
						 | 
						
							2015-12-29 18:59:27 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cyrille Lebeaupin
								
							 
						 | 
						
							
							
								
							
							
	9d878ad6b2
						 | 
						
							
							
								
								
								Add widevine third party
							
							
							
							
							
							
							
							Add 2 new command options to use widevine:
- widevine-cdm-path: Path to widevine plugin
- widevine-cdm-version: Version of the widevine plugin 
							
						 | 
						
							2015-12-29 14:50:59 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	836a8b1794
						 | 
						
							
							
								
								
								Simplify the desktopCapturer code
							
							
							
							
							
						 | 
						
							2015-12-08 13:49:26 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	51368952a2
						 | 
						
							
							
								
								
								Remove deprecated API usages
							
							
							
							
							
						 | 
						
							2015-12-08 12:58:39 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	04f7ceab73
						 | 
						
							
							
								
								
								Merge branch 'master' into desktop-capture-api
							
							
							
							
							
						 | 
						
							2015-12-08 12:43:44 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	e8b5a6dedf
						 | 
						
							
							
								
								
								Merge pull request #3718 from atom/chrome47-linux
							
							
							
							
							
							
							
							Port Chrome47 on Linux 
							
						 | 
						
							2015-12-08 10:14:27 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	9a0cecf943
						 | 
						
							
							
								
								
								Rig GlobalMenuBarRegistrarX11 for Atom
							
							
							
							
							
						 | 
						
							2015-12-07 14:30:26 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	fe86239a9c
						 | 
						
							
							
								
								
								Update to Chrome47 version of tts_linux
							
							
							
							
							
						 | 
						
							2015-12-07 14:28:42 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	4a8d58f914
						 | 
						
							
							
								
								
								Update to Chrome47 version of GlobalMenuBarRegistrarX11
							
							
							
							
							
						 | 
						
							2015-12-07 14:25:52 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	8d5c153e9b
						 | 
						
							
							
								
								
								Update to Chrome 47 version of tts_win
							
							
							
							
							
						 | 
						
							2015-12-07 14:23:01 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	3931ebb7ef
						 | 
						
							
							
								
								
								Fix up Windows build errors
							
							
							
							
							
						 | 
						
							2015-12-07 10:02:06 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	73e7773d84
						 | 
						
							
							
								
								
								Update to API changes of Chrome 47
							
							
							
							
							
						 | 
						
							2015-12-07 19:56:23 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	6bfe06ec4e
						 | 
						
							
							
								
								
								Pass original argv in callback
							
							
							
							
							
						 | 
						
							2015-10-22 19:02:21 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	d52ef50b01
						 | 
						
							
							
								
								
								win: Pass original command line
							
							
							
							
							
						 | 
						
							2015-10-22 17:52:06 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	93a3a946f3
						 | 
						
							
							
								
								
								posix: Pass original command line
							
							
							
							
							
						 | 
						
							2015-10-22 17:43:55 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	afc1fff792
						 | 
						
							
							
								
								
								Remove the need for ProcessSingletonStartupLock
							
							
							
							
							
						 | 
						
							2015-10-22 17:12:09 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	230f2760e7
						 | 
						
							
							
								
								
								linux: Delay creating watcher until message loop is ready
							
							
							
							
							
						 | 
						
							2015-10-22 15:57:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	f01e84a418
						 | 
						
							
							
								
								
								linux: Delay listening to socket until message loop is ready
							
							
							
							
							
						 | 
						
							2015-10-22 15:54:58 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	310954713f
						 | 
						
							
							
								
								
								Simplify the usage of singleton
							
							
							
							
							
						 | 
						
							2015-10-22 14:59:12 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	99c496471b
						 | 
						
							
							
								
								
								Allow WM_COPYDATA from all processes
							
							
							
							
							
						 | 
						
							2015-10-20 17:36:05 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	15f00db1bf
						 | 
						
							
							
								
								
								I don't think we need this
							
							
							
							
							
						 | 
						
							2015-10-20 15:03:59 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	5886398f22
						 | 
						
							
							
								
								
								Port our changes over
							
							
							
							
							
						 | 
						
							2015-10-20 14:24:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	7491d5cfb5
						 | 
						
							
							
								
								
								Copy back the original versions of Chromium files in
							
							
							
							
							
						 | 
						
							2015-10-20 14:05:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	dcb457e76e
						 | 
						
							
							
								
								
								Refine API design: desktopCapturer.getSources.
							
							
							
							
							
						 | 
						
							2015-10-07 11:10:35 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	36c0ad7fda
						 | 
						
							
							
								
								
								Refine more about desktop capturer API.
							
							
							
							
							
							
							
							* Simplify the coffeescript code.
* Add more options in desktopCapturer.startUpdating. 
							
						 | 
						
							2015-10-05 12:47:01 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	1e69ef79de
						 | 
						
							
							
								
								
								Refine: make desktop-capturer as a renderer module.
							
							
							
							
							
						 | 
						
							2015-10-04 22:04:41 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |