Commit graph

3386 commits

Author SHA1 Message Date
Cheng Zhao
5267d734bb Merge pull request #5634 from deepak1556/net_error_description_patch
renderer: generate net error strings when requested
2016-05-22 00:34:56 +00:00
Cheng Zhao
6f3d0e1782 Merge pull request #5603 from leethomas/osx-horizontal-sheet-offset
Osx horizontal sheet offset
2016-05-21 14:07:53 +00:00
deepak1556
c9b314d43c renderer: generate net error strings when requested 2016-05-21 10:21:15 +05:30
Cheng Zhao
3182485e68 No need to reference the icon in Tray 2016-05-20 22:44:02 +09:00
Cheng Zhao
a93c9462ed Add BrowserWindow.setIcon 2016-05-20 22:22:15 +09:00
Cheng Zhao
d26480b74e Correctly set window icon from ICO 2016-05-20 19:46:05 +09:00
Cheng Zhao
ea2807c890 Make it possible to get different size of icons from ICO 2016-05-20 17:51:05 +09:00
Cheng Zhao
0059e7bcf9 Use LoadIconMetric to load correct icon 2016-05-20 17:12:07 +09:00
Cheng Zhao
9e26e5c121 Load HICON directly in NotifyIcon 2016-05-20 16:55:22 +09:00
Cheng Zhao
67d9ae27c3 Remove the JavaScript wrapper for setContextMenu 2016-05-20 16:18:38 +09:00
Cheng Zhao
adfd99f5f0 Convert to mate::Handle<NativeImage> instead of gfx::Image 2016-05-20 16:14:40 +09:00
leethomas
7d93642f42 extend setSheetOffset to accept an optional 2nd offset 2016-05-19 20:32:06 -07:00
Cheng Zhao
7c34d8333c Store ico image in HCION 2016-05-20 11:31:02 +09:00
Cheng Zhao
d5f3e5d59a Bump v1.1.1 2016-05-20 09:30:24 +09:00
Cheng Zhao
983d611e96 Cleanup the docs of process object 2016-05-19 20:12:56 +09:00
Cheng Zhao
0bd3e28a05 Merge pull request #5526 from electron/process-stats
Process and System memory statistics API
2016-05-19 10:34:01 +00:00
Cheng Zhao
53d0db0a28 Merge pull request #5602 from electron/static-linking-vs-runtime
Link with VS2015 libraries statically for Release build
2016-05-19 09:50:53 +00:00
Cheng Zhao
e609a5bee2 Fix passing fd across modules 2016-05-19 16:38:37 +09:00
leethomas
359123458d 🍎 allow x-axis offset to be set for sheets 2016-05-18 23:45:54 -07:00
Cheng Zhao
a361d50b95 Add team ID to base Bundle ID 2016-05-19 10:57:57 +09:00
Paul Betts
e995befcd0 Move everything into atom_bindings 2016-05-18 11:07:30 -07:00
Cheng Zhao
deddf98533 Currently set base bundle ID 2016-05-18 16:42:26 +09:00
Cheng Zhao
d2a567d6ab Merge pull request #5582 from electron/notification-user-info
Pass userInfo in systemPreferences.subscribeNotification
2016-05-18 07:36:31 +00:00
Cheng Zhao
3d0b98c9ca Use string description for unknown types 2016-05-18 16:01:08 +09:00
Cheng Zhao
68cf267b1d Do not convert NSDictionary to JSON 2016-05-18 15:49:33 +09:00
Cheng Zhao
240c346d02 Ignore invalid JSON object when converting NSDictionary 2016-05-18 14:54:37 +09:00
Cheng Zhao
97250b53e8 Pass userInfo in subscribeNotification 2016-05-18 14:40:19 +09:00
Cheng Zhao
5f6c468f0f Handle keyboard events for WebContents that do not have owner window 2016-05-18 13:57:48 +09:00
Cheng Zhao
dc9b3fcef7 Remove WebViewGuestDelegate::HandleKeyboardEvent 2016-05-18 13:57:48 +09:00
Cheng Zhao
d6cb84f8a3 WebContents without owner window should always open detached devtools 2016-05-18 13:57:48 +09:00
Cheng Zhao
998ce73ad9 Add webContents.id property 2016-05-18 13:57:48 +09:00
Cheng Zhao
8a061b7183 A normal WebContents can have no owner window 2016-05-18 13:57:48 +09:00
Cheng Zhao
118afab67b Make sure BrowserContext is always destroyed after WebContents 2016-05-18 13:57:48 +09:00
Paul Betts
60bc2acd6c Linting 2016-05-17 14:47:56 -07:00
Paul Betts
cd7bc0e50c Rename Metrics => MemoryInfo so it's consistent 2016-05-17 14:47:56 -07:00
Paul Betts
75362450cd Everything is in KB 2016-05-17 14:47:56 -07:00
Paul Betts
191b054ff0 Implement process and system memory statistics 2016-05-17 14:47:56 -07:00
Paul Betts
a7ac7ba4c1 Add the dumbest new builtin that works 2016-05-17 14:47:56 -07:00
Cheng Zhao
13bfb099a2 Fix the toolbar showing when titleBarStyle is hidden-inset 2016-05-17 16:25:18 +09:00
Cheng Zhao
f53aabaef5 Implement titleBarStyle without using NSFullSizeContentViewWindowMask 2016-05-17 15:48:14 +09:00
Cheng Zhao
e53bfad018 Fix building on Windows 2016-05-16 10:09:41 +09:00
Ben Gotow
54c654530e Fix linux support 2016-05-15 01:29:13 -05:00
Ben Gotow
6217d497ed Fix build issues 2016-05-15 01:03:32 -05:00
Ben Gotow
84cce6c2c1 Don't default to "Open", "Save", just let OS decide 2016-05-15 01:03:32 -05:00
Ben Gotow
40c531737d Add buttonLabel param to showOpen/showSave dialogs 2016-05-15 01:03:32 -05:00
Cheng Zhao
5ec2e8d7e5 Merge pull request #5413 from electron/process-resource-usage
Fetch Process resource usage from WebContents
2016-05-14 23:28:51 +09:00
Cheng Zhao
d3e359ab2d No need for explicit type conversion 2016-05-14 22:50:05 +09:00
Cheng Zhao
c740438032 Rename webFrame.purgeCaches to webFrame.clearCache
This matches the name of session.clearCache.
2016-05-14 22:48:25 +09:00
Cheng Zhao
7459581d13 Fix cpplint warnings 2016-05-14 22:40:18 +09:00
Paul Betts
652913f8d6 Just return the type directly 2016-05-13 10:54:10 -07:00