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

Add resourceType arg to webContents did-get-response-details event.

Browse source 
Fixes #5074 and follows @zcbenz's recommendation to expose ResourceTypeToString from atom_network_delegate publicly.
Also adds testing for other arguments to the `did-get-response-details` events, since there were no existing tests for them.
This commit is contained in:
Rob Brackett 2016-04-08 11:19:36 -07:00
parent 066092abb6
commit c1b1348735
5 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/net/atom_network_delegate.cc
View file

@ -10,15 +10,12 @@
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_request_info.h"
#include "net/url_request/url_request.h"
using content::BrowserThread;
namespace atom {
namespace {
const char* ResourceTypeToString(content::ResourceType type) {
switch (type) {
case content::RESOURCE_TYPE_MAIN_FRAME:
@ -39,6 +36,8 @@ const char* ResourceTypeToString(content::ResourceType type) {
return "other";
}
}
namespace {
void RunSimpleListener(const AtomNetworkDelegate::SimpleListener& listener,
scoped_ptr<base::DictionaryValue> details) {