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

using mate::Dictionary instead of base::DictionaryValue

Browse source
This commit is contained in:
deepak1556 2015-05-22 09:12:03 +05:30
parent 4d5790dc09
commit 2b9826404a
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -312,15 +312,19 @@ void WebContents::DidStopLoading() {
void WebContents::DidGetResourceResponseStart(
const content::ResourceRequestDetails& details) {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
mate::Dictionary response_headers(isolate, v8::Object::New(isolate));
net::HttpResponseHeaders* headers = details.headers.get();
base::DictionaryValue response_headers;
void* iter = nullptr;
std::string key;
std::string value;
while (headers && headers->EnumerateHeaderLines(&iter, &key, &value)) {
response_headers.SetString(base::StringToLowerASCII(key),
while (headers && headers->EnumerateHeaderLines(&iter, &key, &value))
response_headers.Set(base::StringToLowerASCII(key),
base::StringToLowerASCII(value));
}
Emit("did-get-response-details",
details.socket_address.IsEmpty(),
details.url,

7
atom/common/native_mate_converters/value_converter.cc
View file

@ -23,13 +23,6 @@ bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
}
}
v8::Handle<v8::Value> Converter<base::DictionaryValue>::ToV8(
v8::Isolate* isolate,
const base::DictionaryValue& val) {
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
return converter->ToV8Value(&val, isolate->GetCurrentContext());
}
bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
base::ListValue* out) {

2
atom/common/native_mate_converters/value_converter.h
View file

@ -19,8 +19,6 @@ struct Converter<base::DictionaryValue> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
base::DictionaryValue* out);
static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
const base::DictionaryValue& val);
};
template<>