Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	9e7de78231
						 | 
						
							
							
								
								
								Fix cpplint warnings
							
							
							
							
							
						 | 
						
							2015-09-18 14:12:48 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	c550546ff1
						 | 
						
							
							
								
								
								Do not manually convert Object to WebInputEvent
							
							
							
							
							
						 | 
						
							2015-09-18 14:09:31 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	5a599cb6ff
						 | 
						
							
							
								
								
								Sequence of definitions should follow the declarations
							
							
							
							
							
						 | 
						
							2015-09-18 13:49:33 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	d7bac5a10b
						 | 
						
							
							
								
								
								Remove the offscreen-render option
							
							
							
							
							
							
							
							We are going to move the APIs to WebContents 
							
						 | 
						
							2015-09-18 12:15:13 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	ee0d48dc5a
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/MaxWhere/electron into MaxWhere-master
							
							
							
							
							
						 | 
						
							2015-09-18 12:01:33 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Heilig Benedek
								
							 
						 | 
						
							
							
								
							
							
	5269380b6d
						 | 
						
							
							
								
								
								Removed duplicate keydown event sending.
							
							
							
							
							
						 | 
						
							2015-09-16 03:12:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Heilig Benedek
								
							 
						 | 
						
							
							
								
							
							
	ceef06b344
						 | 
						
							
							
								
								
								Renamed setOffscreenRender to begin/endFrameSubscription because the name was a bit misleading, and replaced the ArrayBuffer creation with a node::Buffer::New call.
							
							
							
							
							
						 | 
						
							2015-09-16 02:59:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	b72a5884f2
						 | 
						
							
							
								
								
								Add BrowserWindow.isDevToolsFocused
							
							
							
							
							
						 | 
						
							2015-09-15 11:43:45 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	0b97d58a6f
						 | 
						
							
							
								
								
								Move a few options in NativeWindow to web-preferences
							
							
							
							
							
						 | 
						
							2015-09-06 10:53:03 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	880dce950d
						 | 
						
							
							
								
								
								Move OverrideWebkitPrefs to WebContentsPreferences
							
							
							
							
							
						 | 
						
							2015-09-06 10:53:03 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	39975378bb
						 | 
						
							
							
								
								
								Move AppendExtraCommandLineSwitches to WebContentsPreferences
							
							
							
							
							
						 | 
						
							2015-09-06 10:53:03 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	96771c7098
						 | 
						
							
							
								
								
								NPAPI has been removed, remove related option
							
							
							
							
							
						 | 
						
							2015-09-06 10:53:03 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Heilig Benedek
								
							 
						 | 
						
							
							
								
							
							
	dbcd0a4235
						 | 
						
							
							
								
								
								Key event sending update.
							
							
							
							
							
						 | 
						
							2015-09-02 02:33:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Heilig Benedek
								
							 
						 | 
						
							
							
								
							
							
	3dd3fd9200
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/brenca/electron
							
							
							
							
							
							
							
							Conflicts:
	atom/browser/api/atom_api_window.h
	atom/browser/native_window.cc 
							
						 | 
						
							2015-08-31 18:46:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Heilig Benedek
								
							 
						 | 
						
							
							
								
							
							
	c59c0bd5b3
						 | 
						
							
							
								
								
								Mouse event handling and keyboard event handling (not totally working yet)
							
							
							
							
							
						 | 
						
							2015-08-31 18:32:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gellert
								
							 
						 | 
						
							
							
								
							
							
	58081ca9e9
						 | 
						
							
							
								
								
								setOffscreenRender and api docs added
							
							
							
							
							
						 | 
						
							2015-08-29 00:45:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Heilig Benedek
								
							 
						 | 
						
							
							
								
							
							
	e4c01f3187
						 | 
						
							
							
								
								
								Offscreen render support base
							
							
							
							
							
						 | 
						
							2015-08-27 11:22:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	a28f70e85c
						 | 
						
							
							
								
								
								Decouple TaskbarHost from NativeWindow
							
							
							
							
							
						 | 
						
							2015-08-06 11:10:34 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	2f1cb8b52a
						 | 
						
							
							
								
								
								Expose NativeWindow.setThumbarButtons API to all platforms.
							
							
							
							
							
						 | 
						
							2015-08-05 22:30:05 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	58b1172025
						 | 
						
							
							
								
								
								Avoid exposing data members to subclass
							
							
							
							
							
						 | 
						
							2015-08-05 12:46:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	438a5acc0f
						 | 
						
							
							
								
								
								Use ranged for loop
							
							
							
							
							
						 | 
						
							2015-08-05 12:34:45 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	58c0486236
						 | 
						
							
							
								
								
								Remove duplicate UpdateDraggableRegions
							
							
							
							
							
						 | 
						
							2015-08-05 12:32:22 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	1347c61c8e
						 | 
						
							
							
								
								
								Set AppUserModelID for all renderer processes
							
							
							
							
							
						 | 
						
							2015-08-04 17:13:05 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	bbce2c7e2f
						 | 
						
							
							
								
								
								Merge pull request #2372 from atom/allow-insecure-content
							
							
							
							
							
							
							
							Add allowing-insecure-content option 
							
						 | 
						
							2015-07-30 09:38:27 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	643ed27fd4
						 | 
						
							
							
								
								
								Check whether entry is null
							
							
							
							
							
							
							
							This fixes the crash in #7877. 
							
						 | 
						
							2015-07-29 18:26:20 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	f154da38e6
						 | 
						
							
							
								
								
								Make 'allow-displaying-insecure-content' and
							
							
							
							
							
							
							
							'allow-running-insecure-content' higher priority than `web-security`. 
							
						 | 
						
							2015-07-29 18:08:44 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haojian Wu
								
							 
						 | 
						
							
							
								
							
							
	77a8a3d33c
						 | 
						
							
							
								
								
								Add allow-running-insecure-content, allow-display-insecure-content
							
							
							
							
							
							
							
							in BrowserWindow option. 
							
						 | 
						
							2015-07-29 16:15:03 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	df35700b94
						 | 
						
							
							
								
								
								Style fixes
							
							
							
							
							
							
							
							* Use under_score for variable names in C++
* Use const& when possible
* Line length <= 80 
							
						 | 
						
							2015-07-23 10:07:58 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael S. Barthelemy
								
							 
						 | 
						
							
							
								
							
							
	6d25c81bd1
						 | 
						
							
							
								
								
								changes requested for pull request #2250 into electron master
							
							
							
							
							
						 | 
						
							2015-07-22 10:23:31 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael S. Barthelemy
								
							 
						 | 
						
							
							
								
							
							
	d0c6176640
						 | 
						
							
							
								
								
								wrap lines to meet Travis CI build requirements
							
							
							
							
							
						 | 
						
							2015-07-16 14:45:27 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael S. Barthelemy
								
							 
						 | 
						
							
							
								
							
							
	7cdfa44438
						 | 
						
							
							
								
								
								shorten names
							
							
							
							
							
						 | 
						
							2015-07-16 14:31:01 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael S. Barthelemy
								
							 
						 | 
						
							
							
								
							
							
	666aca7803
						 | 
						
							
							
								
								
								add function maintainAspectRatioOfInteriorContent to BrowserWindow in order to enforce an aspect ratio for an electron window
							
							
							
							
							
						 | 
						
							2015-07-16 13:54:51 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	3ffd774405
						 | 
						
							
							
								
								
								Merge pull request #2197 from deepak1556/user_agent_patch
							
							
							
							
							
							
							
							webContents: set http useragent settings when overriding user agent 
							
						 | 
						
							2015-07-14 09:59:09 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	9e8a118d10
						 | 
						
							
							
								
								
								Cleanup code
							
							
							
							
							
						 | 
						
							2015-07-14 03:23:19 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	0c7c6ddcc9
						 | 
						
							
							
								
								
								Merge pull request #2175 from atom/propagate-app-model-id
							
							
							
							
							
							
							
							Propagate App Model User ID on Windows 
							
						 | 
						
							2015-07-13 12:16:10 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Robo
								
							 
						 | 
						
							
							
								
							
							
	cb4309bbd9
						 | 
						
							
							
								
								
								webContents: set http useragent settings when overriding user agent
							
							
							
							
							
						 | 
						
							2015-07-13 02:20:15 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	5ae57baf11
						 | 
						
							
							
								
								
								Allow more insecure content when web-security is off
							
							
							
							
							
							
							
							Close #2076 
							
						 | 
						
							2015-07-10 13:29:46 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	39c6e2d2e5
						 | 
						
							
							
								
								
								Linter fixes
							
							
							
							
							
						 | 
						
							2015-07-09 17:00:19 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul Betts
								
							 
						 | 
						
							
							
								
							
							
	779583adf5
						 | 
						
							
							
								
								
								Append the app user model ID as a switch
							
							
							
							
							
						 | 
						
							2015-07-09 16:37:12 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Robo
								
							 
						 | 
						
							
							
								
							
							
	b5c5cce725
						 | 
						
							
							
								
								
								window: use _NET_WM_STATE_FULLSCREEN before window is mapped
							
							
							
							
							
						 | 
						
							2015-06-29 19:44:56 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	1e514620b5
						 | 
						
							
							
								
								
								Remove window from window list before notifying closed event
							
							
							
							
							
						 | 
						
							2015-06-27 17:11:36 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	9f52b11761
						 | 
						
							
							
								
								
								Remove NativeWindow::GetWebContents
							
							
							
							
							
						 | 
						
							2015-06-25 14:54:00 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	9974a238c2
						 | 
						
							
							
								
								
								Fix the order of function definitions
							
							
							
							
							
						 | 
						
							2015-06-25 13:29:30 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	62c44ee47b
						 | 
						
							
							
								
								
								Rename CloseWebContents to RequestToClosePage
							
							
							
							
							
						 | 
						
							2015-06-25 13:27:51 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	eb370ba22a
						 | 
						
							
							
								
								
								Allowing destroying a closed window
							
							
							
							
							
						 | 
						
							2015-06-25 13:08:11 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	afa9f30aac
						 | 
						
							
							
								
								
								Add InspectableWebContentsViewDelegate
							
							
							
							
							
						 | 
						
							2015-06-25 12:30:04 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	fb5fe7a714
						 | 
						
							
							
								
								
								Decouple WebContentsDelegate from NativeWindow
							
							
							
							
							
						 | 
						
							2015-06-25 11:07:23 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	5236b0c067
						 | 
						
							
							
								
								
								Don't create WebContents in NativeWindow
							
							
							
							
							
						 | 
						
							2015-06-25 09:47:57 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	081a4597e9
						 | 
						
							
							
								
								
								Pass isGuest when creating WebContents
							
							
							
							
							
						 | 
						
							2015-06-24 23:29:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cheng Zhao
								
							 
						 | 
						
							
							
								
							
							
	19ca011735
						 | 
						
							
							
								
								
								Discard is_guest_, use type_ instead
							
							
							
							
							
						 | 
						
							2015-06-24 22:23:38 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |