mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert #1604

Browse source
This commit is contained in:
Cheng Zhao 2015-05-20 20:35:54 +08:00
parent bbd8f091e0
commit 4ae1998d09
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/api/atom_api_web_contents.cc
View file

@ -279,20 +279,13 @@ void WebContents::DidStopLoading(content::RenderViewHost* render_view_host) {
void WebContents::DidGetResourceResponseStart( void WebContents::DidGetResourceResponseStart(
const content::ResourceRequestDetails& details) { const content::ResourceRequestDetails& details) {
auto context = static_cast<brightray::BrowserContext*>(
web_contents()->GetBrowserContext());
std::string headers;
if (context)
headers = context->GetNetworkDelegate()->GetResponseHeaders(details.url);
Emit("did-get-response-details", Emit("did-get-response-details",
details.socket_address.IsEmpty(), details.socket_address.IsEmpty(),
details.url, details.url,
details.original_url, details.original_url,
details.http_response_code, details.http_response_code,
details.method, details.method,
details.referrer, details.referrer);
headers);
} }
void WebContents::DidGetRedirectForResourceRequest( void WebContents::DidGetRedirectForResourceRequest(

3
atom/renderer/lib/web-view/guest-view-internal.coffee
View file

@ -10,8 +10,7 @@ WEB_VIEW_EVENTS =
'did-start-loading': [] 'did-start-loading': []
'did-stop-loading': [] 'did-stop-loading': []
'did-get-response-details': ['status', 'newUrl', 'originalUrl', 'did-get-response-details': ['status', 'newUrl', 'originalUrl',
'httpResponseCode', 'requestMethod', 'referrer', 'httpResponseCode', 'requestMethod', 'referrer']
'headers']
'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame'] 'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame']
'dom-ready': [] 'dom-ready': []
'console-message': ['level', 'message', 'line', 'sourceId'] 'console-message': ['level', 'message', 'line', 'sourceId']