Fix CORS header code to be cleaner
authorPaul Betts <paul@paulbetts.org>
Wed, 25 Nov 2015 23:00:34 +0000 (15:00 -0800)
committerPaul Betts <paul@paulbetts.org>
Mon, 30 Nov 2015 19:08:44 +0000 (11:08 -0800)
atom/browser/net/js_asker.cc
atom/browser/net/js_asker.h
atom/browser/net/url_request_buffer_job.cc
atom/browser/net/url_request_string_job.cc

index 8f0d1d2b95778d59b49851e7dfa2504258a9c617..0e232feffb9d2996d9ed291ae6d1fcb55bcbf23a 100644 (file)
@@ -11,6 +11,8 @@
 
 namespace atom {
 
+const std::string kCorsHeader("Access-Control-Allow-Origin: *");
+
 namespace internal {
 
 namespace {
index 8ec245ee8c4f5ff30f0e5e9a682b1097c65aa7f4..cdc0417f36d343751c60d19e46455b58f12a208d 100644 (file)
@@ -17,6 +17,7 @@
 #include "v8/include/v8.h"
 
 namespace atom {
+extern const std::string kCorsHeader;
 
 using JavaScriptHandler =
     base::Callback<void(const net::URLRequest*, v8::Local<v8::Value>)>;
index c4936ba15696a3300e66fd0baee1ec36d74e758b..55603e77e027105ddbc4b1632e3b710e998486bf 100644 (file)
@@ -50,8 +50,7 @@ void URLRequestBufferJob::GetResponseInfo(net::HttpResponseInfo* info) {
   status.append("\0\0", 2);
   net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
 
-  std::string cors("Access-Control-Allow-Origin: *");
-  headers->AddHeader(cors);
+  headers->AddHeader(kCorsHeader);
 
   if (!mime_type_.empty()) {
     std::string content_type_header(net::HttpRequestHeaders::kContentType);
index 5d7a7dd017c9f5df88c0e7ea3ac2781d92960f30..6a12026b2d7411719135d6f462d0c1262e5d6fa3 100644 (file)
@@ -32,8 +32,7 @@ void URLRequestStringJob::GetResponseInfo(net::HttpResponseInfo* info) {
   std::string status("HTTP/1.1 200 OK");
   net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
 
-  std::string cors("Access-Control-Allow-Origin: *");
-  headers->AddHeader(cors);
+  headers->AddHeader(kCorsHeader);
 
   if (!mime_type_.empty()) {
     std::string content_type_header(net::HttpRequestHeaders::kContentType);