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

Move AtomSSLConfigService to atom/browser/net

Browse source
This commit is contained in:
Cheng Zhao 2015-11-17 19:05:38 +08:00
parent 37f355724a
commit ea1e4160ea
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/atom_browser_context.cc
View file

@ -6,9 +6,9 @@
#include "atom/browser/atom_browser_main_parts.h" #include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/atom_download_manager_delegate.h" #include "atom/browser/atom_download_manager_delegate.h"
#include "atom/browser/atom_ssl_config_service.h"
#include "atom/browser/browser.h" #include "atom/browser/browser.h"
#include "atom/browser/net/atom_cert_verifier.h" #include "atom/browser/net/atom_cert_verifier.h"
#include "atom/browser/net/atom_ssl_config_service.h"
#include "atom/browser/net/atom_url_request_job_factory.h" #include "atom/browser/net/atom_url_request_job_factory.h"
#include "atom/browser/net/asar/asar_protocol_handler.h" #include "atom/browser/net/asar/asar_protocol_handler.h"
#include "atom/browser/net/http_protocol_handler.h" #include "atom/browser/net/http_protocol_handler.h"

2
atom/browser/atom_ssl_config_service.cc → atom/browser/net/atom_ssl_config_service.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/atom_ssl_config_service.h" #include "atom/browser/net/atom_ssl_config_service.h"
#include <string> #include <string>
#include <vector> #include <vector>

6
atom/browser/atom_ssl_config_service.h → atom/browser/net/atom_ssl_config_service.h
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATOM_BROWSER_ATOM_SSL_CONFIG_SERVICE_H_ #ifndef ATOM_BROWSER_NET_ATOM_SSL_CONFIG_SERVICE_H_
#define ATOM_BROWSER_ATOM_SSL_CONFIG_SERVICE_H_ #define ATOM_BROWSER_NET_ATOM_SSL_CONFIG_SERVICE_H_
#include "net/ssl/ssl_config_service.h" #include "net/ssl/ssl_config_service.h"
@ -25,4 +25,4 @@ class AtomSSLConfigService : public net::SSLConfigService {
} // namespace atom } // namespace atom
#endif // ATOM_BROWSER_ATOM_SSL_CONFIG_SERVICE_H_ #endif // ATOM_BROWSER_NET_ATOM_SSL_CONFIG_SERVICE_H_

4
filenames.gypi
View file

@ -141,8 +141,6 @@
'atom/browser/atom_resource_dispatcher_host_delegate.h', 'atom/browser/atom_resource_dispatcher_host_delegate.h',
'atom/browser/atom_speech_recognition_manager_delegate.cc', 'atom/browser/atom_speech_recognition_manager_delegate.cc',
'atom/browser/atom_speech_recognition_manager_delegate.h', 'atom/browser/atom_speech_recognition_manager_delegate.h',
'atom/browser/atom_ssl_config_service.cc',
'atom/browser/atom_ssl_config_service.h',
'atom/browser/bridge_task_runner.cc', 'atom/browser/bridge_task_runner.cc',
'atom/browser/bridge_task_runner.h', 'atom/browser/bridge_task_runner.h',
'atom/browser/browser.cc', 'atom/browser/browser.cc',
@ -175,6 +173,8 @@
'atom/browser/net/asar/url_request_asar_job.h', 'atom/browser/net/asar/url_request_asar_job.h',
'atom/browser/net/atom_cert_verifier.cc', 'atom/browser/net/atom_cert_verifier.cc',
'atom/browser/net/atom_cert_verifier.h', 'atom/browser/net/atom_cert_verifier.h',
'atom/browser/net/atom_ssl_config_service.cc',
'atom/browser/net/atom_ssl_config_service.h',
'atom/browser/net/atom_url_request_job_factory.cc', 'atom/browser/net/atom_url_request_job_factory.cc',
'atom/browser/net/atom_url_request_job_factory.h', 'atom/browser/net/atom_url_request_job_factory.h',
'atom/browser/net/http_protocol_handler.cc', 'atom/browser/net/http_protocol_handler.cc',