Merge remote-tracking branch 'atom/master'

This commit is contained in:
Plusb Preco 2015-08-21 11:41:07 +09:00
commit ad24c11f32
171 changed files with 4032 additions and 968 deletions

View file

@ -20,7 +20,8 @@ var win = new BrowserWindow({ width: 800, height: 600 });
win.loadUrl('https://github.com');
```
Note: for the reverse (access renderer process from main process), you can use [webContents.executeJavascript](https://github.com/atom/electron/blob/master/docs/api/browser-window.md#browserwindowwebcontents).
Note: for the reverse (access renderer process from main process), you can use
[webContents.executeJavascript](browser-window.md#webcontents-executejavascript-code).
## Remote objects