Commit graph

4351 commits

Author SHA1 Message Date
Hari Krishna Reddy Juturu
94d054cf11 Add option to override webview security 2017-05-06 22:10:42 -07:00
Hari Krishna Reddy Juturu
b4a8ed01f1 PR 44648: Enabling creation on webview with node-integration disabled and raising events
- Enabling creation on webview with node-integration disabled and raising events

Conflicts:
	lib/browser/guest-view-manager.js
2017-05-06 20:50:01 -07:00
Kevin Sawicki
eebae82bc1 Merge pull request #9315 from electron/segmented-control-mode
Add mode prop to segmented touch bar control
2017-05-04 14:16:28 -07:00
Kevin Sawicki
59511354fd Merge pull request #9214 from electron/app-memoryinfo
API to get memory of all processes of the app
2017-05-04 14:00:30 -07:00
Hari Krishna Reddy Juturu
ab1bcefe9e Make pid an integer 2017-05-04 13:37:43 -07:00
Kevin Sawicki
e206aae9fc 🎨 Use snake case 2017-05-04 13:27:42 -07:00
Kevin Sawicki
c59fab0179 Merge pull request #9242 from shiftkey/certificate-addition-windows
certificate trust API for Windows
2017-05-03 16:39:00 -07:00
Kevin Sawicki
110611f242 🎨 2017-05-03 16:22:56 -07:00
22222
042b511a27 Fix #8911 2017-05-03 12:47:00 -05:00
Samuel Attard
718dc732ad
Add docs and add isSelected arg 2017-05-03 20:25:50 +10:00
Kevin Sawicki
c6c93211be Merge remote-tracking branch 'origin/master' into chrome58 2017-05-02 09:15:16 -07:00
Brendan Forster
e5648072dc handle untrusted root as well as self-signed 2017-05-02 11:25:51 +10:00
Kevin Sawicki
a748199833 Bump v1.6.8 2017-05-01 15:09:30 -07:00
Kevin Sawicki
b639dd0c81 Remove unused include/require statement 2017-05-01 10:30:11 -07:00
Kevin Sawicki
f2f6415543 Use v8 to parse message as JSON 2017-05-01 10:30:11 -07:00
deepak1556
0476e2fd3d destroy browserView webContents asynchronously 2017-05-01 16:53:55 +09:00
deepak1556
c68f41b8d8 destroy new window webContents asynchronously 2017-05-01 16:53:55 +09:00
deepak1556
5e976be43b remove page-title-updated workaround for #3380 2017-05-01 16:53:55 +09:00
deepak1556
9e3b8ade12 invoke WebContentsDestroyed manually when destruction path is async 2017-05-01 16:53:14 +09:00
deepak1556
f974a6bda9 browser: make destruction of webContents async 2017-05-01 16:53:14 +09:00
Brendan Forster
14f29e1319 it's 2017 get with the times 2017-04-29 19:29:07 +10:00
Brendan Forster
1ccc2afb03 underscore case all the things 2017-04-29 19:28:42 +10:00
Samuel Attard
225ccab3d2
Add mode prop to segmented touch bar control 2017-04-28 14:50:58 +10:00
Hari Krishna Reddy Juturu
07b53c0284 Return mate::Dictionary instead of v8::value 2017-04-27 21:07:35 -07:00
HariJ
81bd9fa3a2 fixing mac ut failure 2017-04-27 14:06:53 -07:00
Hari Krishna Reddy Juturu
3d12440a4a Fixing mac build 2017-04-27 14:06:53 -07:00
Hari Krishna Reddy Juturu
27aad902b8 Adding docs, specs and fixing object returned 2017-04-27 14:06:53 -07:00
Hari Krishna Reddy Juturu
bef7d5a520 API to get memory of all processes of the app 2017-04-27 14:06:53 -07:00
Cheng Zhao
0fb746b350 Fix crash when using secure schemes 2017-04-27 16:34:52 +09:00
Cheng Zhao
8c5fd76286 Fix symbol conflicts in Xlib.h 2017-04-27 16:34:52 +09:00
Cheng Zhao
b3d60bfb3a Fix building on Linux 2017-04-27 16:34:52 +09:00
Cheng Zhao
97fd383c53 There are a few more new values for ChangeCause 2017-04-27 16:34:52 +09:00
Cheng Zhao
b2b2d8d9a4 Fix crash on exit 2017-04-27 16:34:52 +09:00
Cheng Zhao
d85b58fdb5 Fix API changes of FrameSubscriber 2017-04-27 16:34:52 +09:00
Cheng Zhao
481b04358e Fix blink API changes 2017-04-27 16:34:52 +09:00
Cheng Zhao
8634f37dfc Add gen/third_party/WebKit to include dirs 2017-04-27 16:34:52 +09:00
Cheng Zhao
dd3d791cb9 IsolateHolder API has been changed 2017-04-27 16:34:52 +09:00
Cheng Zhao
5fb87f0c1e ResourceHandler API has been changed 2017-04-27 16:34:52 +09:00
Cheng Zhao
6be10ffef2 Fix more API changes due to name changes 2017-04-27 16:34:52 +09:00
Cheng Zhao
50e3bfa764 Fix API changes of base::Value 2017-04-27 16:34:52 +09:00
Cheng Zhao
9d1b88ed59 Fix API changes in OSR code 2017-04-27 16:34:52 +09:00
Cheng Zhao
fc2d62d5cb Fix API changes of Chrome58 2017-04-27 16:34:52 +09:00
Brendan Forster
a1599cf881 focus on the self-signed certificate flow here 2017-04-27 15:06:23 +10:00
Brendan Forster
5151107c28 tighten up indenting 2017-04-27 15:01:55 +10:00
Brendan Forster
50af70a0e8 Merge branch 'master' into certificate-addition-windows 2017-04-27 14:47:50 +10:00
Brendan Forster
80212c0ab4 actually validate the chain before adding 2017-04-27 14:44:58 +10:00
Ryohei Ikegami
1d73e84a29 Merge branch 'master' into native-window-open 2017-04-27 12:03:55 +09:00
Kevin Sawicki
7881376aff Merge pull request #9254 from electron/endsession-event
End session event on browser window
2017-04-24 12:02:05 -07:00
Hari Krishna Reddy Juturu
8458acff26 Removing #ifdef on endsession api 2017-04-24 11:58:08 -07:00
Hari Krishna Reddy Juturu
8a32826876 Removing #ifdef windows for endsession methods 2017-04-24 11:49:21 -07:00