Commit graph

850 commits

Author SHA1 Message Date
Cheng Zhao
e67d0db448 OpenSSL is still used on Windows and Mac 2015-07-06 12:03:33 +08:00
Cheng Zhao
31b88f7370 USE_NSS is used before Chrome 45 2015-07-06 11:49:49 +08:00
Cheng Zhao
36447f6613 Use NSS instead of OpenSSL 2015-07-06 10:52:20 +08:00
Cheng Zhao
c210c68bee Remove -std=gnu++11 flag 2015-07-01 07:48:29 +00:00
Cheng Zhao
3826e8864a Fix a compiler warning 2015-07-01 06:50:07 +00:00
Cheng Zhao
d440a3c21d Do not force using clang 2015-07-01 14:32:04 +08:00
Cheng Zhao
de57d822d7 Merge pull request #121 from darwin/missing-overrides
Missing overrides
2015-06-26 21:30:56 +08:00
Antonin Hildebrand
899c730ece Missing overrides
ninja compilation failed for me under OS X 10.11
2015-06-26 11:39:41 +02:00
Cheng Zhao
f477e6ca6a Don't hide methods of content::BrowserContext 2015-06-26 10:58:06 +08:00
Cheng Zhao
f9dc87ba97 Add InspectableWebContentsViewDelegate 2015-06-25 12:29:34 +08:00
Cheng Zhao
9fb30b702a Check if image is empty. 2015-06-18 12:41:36 +08:00
Cheng Zhao
a24d4cd0d9 Merge pull request #120 from atom/osx-image-on-109-only
Ensure we don't try to set notification contentImage on < OS X 10.9
2015-06-18 12:35:59 +08:00
Paul Betts
c3de789fd7 Ensure we don't try to set contentImage on 10.7/10.8. That would be rude! 2015-06-17 13:01:48 -07:00
Cheng Zhao
0e6e4b6c5e Merge pull request #118 from atom/osx-notification-image
Set contentImage based on the passed-in image
2015-06-17 12:37:15 +08:00
Paul Betts
0e98519d3b Set contentImage based on the passed-in image 2015-06-16 18:00:39 -07:00
Cheng Zhao
ca021d030f Add --ignore-connections-limit switch 2015-06-16 16:03:43 +08:00
Cheng Zhao
cb6fba94fc Merge pull request #117 from deepak1556/gyp_defines_patch
define openssl_certs on linux
2015-06-16 13:36:54 +08:00
deepak1556
27fbdf3cf2 define openssl_certs on linux 2015-06-11 23:18:47 +05:30
Cheng Zhao
3cea64b0f6 Fix typo 2015-06-10 19:30:57 +08:00
Cheng Zhao
9868d46d63 OpenSSL is actually used by all platforms 2015-06-10 19:15:45 +08:00
Cheng Zhao
4b26cbf24b Merge pull request #115 from deepak1556/cert_store_patch
intiailse platform clientcertstore
2015-06-10 19:14:58 +08:00
deepak1556
3ac3a2f115 intiailse platform clientcertstore 2015-06-10 02:37:11 +05:30
Cheng Zhao
5e943e1456 view_ needs to be destroyed after web_contents_ 2015-06-09 11:09:16 +08:00
Cheng Zhao
e0992884e6 Merge pull request #116 from atom/delete-requests
Make devtools_web_contents_ is destroyed before everything
2015-06-09 11:02:45 +08:00
Cheng Zhao
64c4a34507 Make devtools_web_contents_ is destroyed before everything
The WebContentsDestroyed still access the other members, so if they are
destroyed before the devtools_web_contents_ in the destructor, we will
crash there.
2015-06-09 10:44:48 +08:00
Cheng Zhao
418264d42a Merge pull request #114 from deepak1556/webcontents_patch
fix dereferencing possibly null pointer
2015-06-09 10:31:07 +08:00
Cheng Zhao
b2eb23aa01 Clean up code 2015-06-09 09:51:38 +08:00
Cheng Zhao
a56c132835 Merge pull request #113 from deepak1556/net_log_patch
adding support for kLogNetLog switch
2015-06-08 23:13:03 +08:00
deepak1556
8adb65fa29 fix dereferencing null pointer 2015-06-08 20:31:07 +05:30
deepak1556
2ba119f395 fix memory leak 2015-06-08 19:56:48 +05:30
deepak1556
15255944b6 create net log instance only when needed 2015-06-08 19:19:44 +05:30
deepak1556
33f65ba981 fix crash on quit 2015-06-06 14:33:07 +05:30
deepak1556
1022357700 adding netconstants to log 2015-06-06 00:13:10 +05:30
deepak1556
ee6b14d1d8 adding support for kLogNetLog switch 2015-06-05 20:25:08 +05:30
Cheng Zhao
51bb357405 Add DevToolsOpened and DevToolsClosed events 2015-06-05 16:57:17 +08:00
Cheng Zhao
d1e70e7826 Add InspectableWebContents::GetDevToolsWebContents 2015-06-05 14:33:37 +08:00
Cheng Zhao
9ab9b392d6 Fix crash when quitting 2015-06-05 12:35:41 +08:00
Cheng Zhao
44ba4e87aa Merge pull request #112 from atom/devtools-load-network-resources
Fix networking requests not loading in devtools
2015-06-05 12:27:00 +08:00
Cheng Zhao
05f182f650 Clean up code 2015-06-05 12:24:48 +08:00
Cheng Zhao
aa926680a2 No more need to override DidFinishLoad 2015-06-05 12:10:01 +08:00
Cheng Zhao
95d28c398e Update cpplint 2015-06-05 12:07:27 +08:00
Cheng Zhao
56747e975e Avoid calling JavaScript of devtools WebContents too early
It would craete a context that window.location is about:blank
2015-06-05 11:58:27 +08:00
Cheng Zhao
9a9bc5530e Handle network requests from devtools 2015-06-05 11:20:20 +08:00
Cheng Zhao
d48a80bdfa Update to new devtools messages 2015-06-05 11:03:47 +08:00
Cheng Zhao
3f2c2e3484 Merge pull request #111 from deepak1556/devtools_workspace_patch
delegate filesystem request calls
2015-06-05 10:32:10 +08:00
deepak1556
62f860123d delegate filesystem request calls 2015-06-04 22:21:23 +05:30
Cheng Zhao
894cc64276 Link with gmodule-2.0, fix atom/electron#1809 2015-06-04 14:41:16 +08:00
Cheng Zhao
239ddea0ce Merge pull request #110 from aroben/devtools-security
Make devtools work when web security is enabled
2015-06-03 09:51:32 +08:00
Adam Roben
2025b60968 Make devtools work when web security is enabled
These changes bring our copy of devtools_ui.cc in line with
https://chromium.googlesource.com/chromium/src.git/+/43.0.2357.92/chrome/browser/ui/webui/devtools_ui.cc

Without these changes, opening the devtools prints errors like:

    [0602/165604:ERROR:CONSOLE(0)] "Refused to display 'chrome-devtools://devtools/inspector.html?can_dock=true&toolbarColor=rgba(223,223,223,1)&textColor=rgba(0,0,0,1)&experiments=true' in a frame because it set 'X-Frame-Options' to 'DENY'.", source: about:blank (0)
    [0602/165604:ERROR:CONSOLE(1514)] "Uncaught SecurityError: Sandbox access violation: Blocked a frame at "chrome-devtools://devtools" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.", source: chrome-devtools://devtools/devtools.js (1514)
2015-06-02 16:56:17 -04:00
Cheng Zhao
3a005fd52a Update libchromiumcontent 2015-05-29 17:51:50 +08:00