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

Fixing build: removing constness on net::HttpResponseHeaders as otherwise we would need a change in libchromiumcontent.

Browse source
This commit is contained in:
ali.ibrahim 2016-10-13 17:51:19 +02:00
parent 6f5b0a28c5
commit de29f2dde5
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_url_request.cc
View file

@ -322,7 +322,7 @@ void URLRequest::OnAuthenticationRequired(
}
void URLRequest::OnResponseStarted(
scoped_refptr<const net::HttpResponseHeaders> response_headers) {
scoped_refptr<net::HttpResponseHeaders> response_headers) {
if (request_state_.Canceled() ||
request_state_.Failed() ||
request_state_.Closed()) {
@ -394,7 +394,7 @@ std::string URLRequest::StatusMessage() const {
return result;
}
scoped_refptr<const net::HttpResponseHeaders>
scoped_refptr<net::HttpResponseHeaders>
URLRequest::RawResponseHeaders() const {
return response_headers_;
}

6
atom/browser/api/atom_api_url_request.h
View file

@ -102,7 +102,7 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
void OnAuthenticationRequired(
scoped_refptr<const net::AuthChallengeInfo> auth_info);
void OnResponseStarted(
scoped_refptr<const net::HttpResponseHeaders> response_headers);
scoped_refptr<net::HttpResponseHeaders> response_headers);
void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);
void OnResponseCompleted();
void OnRequestError(const std::string& error);
@ -178,7 +178,7 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
bool CanReadHeaders() const;
int StatusCode() const;
std::string StatusMessage() const;
scoped_refptr<const net::HttpResponseHeaders> RawResponseHeaders() const;
scoped_refptr<net::HttpResponseHeaders> RawResponseHeaders() const;
uint32_t ResponseHttpVersionMajor() const;
uint32_t ResponseHttpVersionMinor() const;
@ -202,7 +202,7 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
// Used to implement pin/unpin.
v8::Global<v8::Object> wrapper_;
scoped_refptr<const net::HttpResponseHeaders> response_headers_;
scoped_refptr<net::HttpResponseHeaders> response_headers_;
base::WeakPtrFactory<URLRequest> weak_ptr_factory_;

4
atom/browser/net/atom_url_request.cc
View file

@ -249,7 +249,7 @@ void AtomURLRequest::OnResponseStarted(net::URLRequest* request) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
DCHECK_EQ(request, request_.get());
scoped_refptr<const net::HttpResponseHeaders> response_headers =
scoped_refptr<net::HttpResponseHeaders> response_headers =
request->response_headers();
const auto& status = request_->status();
if (status.is_success()) {
@ -358,7 +358,7 @@ void AtomURLRequest::InformDelegateAuthenticationRequired(
}
void AtomURLRequest::InformDelegateResponseStarted(
scoped_refptr<const net::HttpResponseHeaders> response_headers) const {
scoped_refptr<net::HttpResponseHeaders> response_headers) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (delegate_)
delegate_->OnResponseStarted(response_headers);

2
atom/browser/net/atom_url_request.h
View file

@ -72,7 +72,7 @@ class AtomURLRequest : public base::RefCountedThreadSafe<AtomURLRequest>,
void InformDelegateAuthenticationRequired(
scoped_refptr<net::AuthChallengeInfo> auth_info) const;
void InformDelegateResponseStarted(
scoped_refptr<const net::HttpResponseHeaders>) const;
scoped_refptr<net::HttpResponseHeaders>) const;
void InformDelegateResponseData(
scoped_refptr<net::IOBufferWithSize> data) const;
void InformDelegateResponseCompleted() const;

4
atom/common/native_mate_converters/net_converter.cc
View file

@ -61,9 +61,9 @@ v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
// static
v8::Local<v8::Value>
Converter<scoped_refptr<const net::HttpResponseHeaders>>::ToV8(
Converter<scoped_refptr<net::HttpResponseHeaders>>::ToV8(
v8::Isolate* isolate,
scoped_refptr<const net::HttpResponseHeaders> headers) {
scoped_refptr<net::HttpResponseHeaders> headers) {
base::DictionaryValue response_headers;
if (headers) {
size_t iter = 0;

4
atom/common/native_mate_converters/net_converter.h
View file

@ -35,9 +35,9 @@ struct Converter<scoped_refptr<net::X509Certificate>> {
};
template<>
struct Converter<scoped_refptr<const net::HttpResponseHeaders>> {
struct Converter<scoped_refptr<net::HttpResponseHeaders>> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
scoped_refptr<const net::HttpResponseHeaders> headers);
scoped_refptr<net::HttpResponseHeaders> headers);
};
} // namespace mate