From 0f17a0163d16f8cdc2a032ebd96a3034525c0271 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 1 Dec 2015 16:21:15 +0800
Subject: [PATCH] Put common constants in atom_constants

---
 atom/browser/net/js_asker.cc                   |  2 --
 atom/browser/net/js_asker.h                    |  3 ---
 atom/browser/net/url_request_async_asar_job.cc |  5 +++--
 atom/browser/net/url_request_buffer_job.cc     |  3 ++-
 atom/browser/net/url_request_string_job.cc     |  3 ++-
 atom/common/atom_constants.cc                  | 11 +++++++++++
 atom/common/atom_constants.h                   | 15 +++++++++++++++
 filenames.gypi                                 |  2 ++
 8 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 atom/common/atom_constants.cc
 create mode 100644 atom/common/atom_constants.h

diff --git a/atom/browser/net/js_asker.cc b/atom/browser/net/js_asker.cc
index 0e232fe..8f0d1d2 100644
--- a/atom/browser/net/js_asker.cc
+++ b/atom/browser/net/js_asker.cc
@@ -11,8 +11,6 @@
 
 namespace atom {
 
-const std::string kCorsHeader("Access-Control-Allow-Origin: *");
-
 namespace internal {
 
 namespace {
diff --git a/atom/browser/net/js_asker.h b/atom/browser/net/js_asker.h
index b353b98..8ec245e 100644
--- a/atom/browser/net/js_asker.h
+++ b/atom/browser/net/js_asker.h
@@ -5,8 +5,6 @@
 #ifndef ATOM_BROWSER_NET_JS_ASKER_H_
 #define ATOM_BROWSER_NET_JS_ASKER_H_
 
-#include <string>
-
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -19,7 +17,6 @@
 #include "v8/include/v8.h"
 
 namespace atom {
-extern const std::string kCorsHeader;
 
 using JavaScriptHandler =
     base::Callback<void(const net::URLRequest*, v8::Local<v8::Value>)>;
diff --git a/atom/browser/net/url_request_async_asar_job.cc b/atom/browser/net/url_request_async_asar_job.cc
index 4606525..3578f3b 100644
--- a/atom/browser/net/url_request_async_asar_job.cc
+++ b/atom/browser/net/url_request_async_asar_job.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "atom/common/atom_constants.h"
+
 namespace atom {
 
 URLRequestAsyncAsarJob::URLRequestAsyncAsarJob(
@@ -36,12 +38,11 @@ void URLRequestAsyncAsarJob::StartAsync(scoped_ptr<base::Value> options) {
   }
 }
 
-
 void URLRequestAsyncAsarJob::GetResponseInfo(net::HttpResponseInfo* info) {
   std::string status("HTTP/1.1 200 OK");
   net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
 
-  headers->AddHeader(kCorsHeader);
+  headers->AddHeader(kCORSHeader);
   info->headers = headers;
 }
 
diff --git a/atom/browser/net/url_request_buffer_job.cc b/atom/browser/net/url_request_buffer_job.cc
index 55603e7..aa273bf 100644
--- a/atom/browser/net/url_request_buffer_job.cc
+++ b/atom/browser/net/url_request_buffer_job.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "atom/common/atom_constants.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/net_errors.h"
 
@@ -50,7 +51,7 @@ void URLRequestBufferJob::GetResponseInfo(net::HttpResponseInfo* info) {
   status.append("\0\0", 2);
   net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
 
-  headers->AddHeader(kCorsHeader);
+  headers->AddHeader(kCORSHeader);
 
   if (!mime_type_.empty()) {
     std::string content_type_header(net::HttpRequestHeaders::kContentType);
diff --git a/atom/browser/net/url_request_string_job.cc b/atom/browser/net/url_request_string_job.cc
index 6a12026..6067811 100644
--- a/atom/browser/net/url_request_string_job.cc
+++ b/atom/browser/net/url_request_string_job.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "atom/common/atom_constants.h"
 #include "net/base/net_errors.h"
 
 namespace atom {
@@ -32,7 +33,7 @@ void URLRequestStringJob::GetResponseInfo(net::HttpResponseInfo* info) {
   std::string status("HTTP/1.1 200 OK");
   net::HttpResponseHeaders* headers = new net::HttpResponseHeaders(status);
 
-  headers->AddHeader(kCorsHeader);
+  headers->AddHeader(kCORSHeader);
 
   if (!mime_type_.empty()) {
     std::string content_type_header(net::HttpRequestHeaders::kContentType);
diff --git a/atom/common/atom_constants.cc b/atom/common/atom_constants.cc
new file mode 100644
index 0000000..dacda3c
--- /dev/null
+++ b/atom/common/atom_constants.cc
@@ -0,0 +1,11 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/common/atom_constants.h"
+
+namespace atom {
+
+const char* kCORSHeader = "Access-Control-Allow-Origin: *";
+
+}  // namespace atom
diff --git a/atom/common/atom_constants.h b/atom/common/atom_constants.h
new file mode 100644
index 0000000..e0d42e8
--- /dev/null
+++ b/atom/common/atom_constants.h
@@ -0,0 +1,15 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_ATOM_CONSTANTS_H_
+#define ATOM_COMMON_ATOM_CONSTANTS_H_
+
+namespace atom {
+
+// Header to ignore CORS.
+extern const char* kCORSHeader;
+
+}  // namespace atom
+
+#endif  // ATOM_COMMON_ATOM_CONSTANTS_H_
diff --git a/filenames.gypi b/filenames.gypi
index 7157079..151a69f 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -286,6 +286,8 @@
       'atom/common/asar/scoped_temporary_file.h',
       'atom/common/atom_command_line.cc',
       'atom/common/atom_command_line.h',
+      'atom/common/atom_constants.cc',
+      'atom/common/atom_constants.h',
       'atom/common/common_message_generator.cc',
       'atom/common/common_message_generator.h',
       'atom/common/crash_reporter/crash_reporter.cc',
-- 
2.7.4