summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 19:29:30 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 19:29:30 +0000
commit2db279835b789277f2e1d24fbb138ce8a562250f (patch)
tree53d8ec915e811e97c93acab389dc21d65f7bd16a
parentb2b8b8313cf35d02e038f48f03cb0dd2a56ace0b (diff)
downloadchromium_src-2db279835b789277f2e1d24fbb138ce8a562250f.zip
chromium_src-2db279835b789277f2e1d24fbb138ce8a562250f.tar.gz
chromium_src-2db279835b789277f2e1d24fbb138ce8a562250f.tar.bz2
Make cert_store.cc compile on Mac and Linux.
Review URL: http://codereview.chromium.org/20135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9326 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser.scons1
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host.cc2
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj2
-rw-r--r--chrome/common/temp_scaffolding_stubs.h16
4 files changed, 3 insertions, 18 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index c40715d..8584b73 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -680,7 +680,6 @@ if not env.Bit('windows'):
'browser_shutdown.cc',
'browser_url_handler.cc',
'browsing_data_remover.cc',
- 'cert_store.cc',
'character_encoding.cc',
'chrome_plugin_host.cc',
'dock_info.cc',
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index a778bf3..5b58ce8 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -11,6 +11,7 @@
#include "base/message_loop.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
+#include "chrome/browser/cert_store.h"
#include "chrome/browser/cross_site_request_manager.h"
#include "chrome/browser/renderer_host/async_resource_handler.h"
#include "chrome/browser/renderer_host/buffered_resource_handler.h"
@@ -36,7 +37,6 @@
#if defined(OS_POSIX)
#include "chrome/common/temp_scaffolding_stubs.h"
#elif defined(OS_WIN)
-#include "chrome/browser/cert_store.h"
#include "chrome/browser/download/download_file.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/download/download_request_manager.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index fbd3bf4..a3aa8ea 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -456,6 +456,7 @@
E4F3258C0EE83767002533CE /* libgoogleurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFF6E0E9D540F009A6919 /* libgoogleurl.a */; };
E4F325C80EE83A45002533CE /* ipc_fuzzing_tests.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBAD0E9D4C9F009A6919 /* ipc_fuzzing_tests.cc */; };
E4F325D10EE83B71002533CE /* ipc_tests.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBBE0E9D4C9F009A6919 /* ipc_tests.cc */; };
+ E765478D55A73228BAD044E3 /* cert_store.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8570E9D4839009A6919 /* cert_store.cc */; };
F775995035B63E51251B0922 /* ssl_error_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = 26D97CE692D919FEB1521E43 /* ssl_error_info.cc */; };
/* End PBXBuildFile section */
@@ -4593,6 +4594,7 @@
E45075E20F150A6F003BE099 /* buffered_resource_handler.cc in Sources */,
475CAF858604B413561740C1 /* cache_manager_host.cc in Sources */,
4D7BF98D0E9D485B009A6919 /* cancelable_request.cc in Sources */,
+ E765478D55A73228BAD044E3 /* cert_store.cc in Sources */,
E43A770D0F16610300ABD5D1 /* chrome_plugin_browsing_context.cc in Sources */,
4D7BF9920E9D485F009A6919 /* chrome_thread.cc in Sources */,
E43A771C0F1661AF00ABD5D1 /* chrome_url_data_manager.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index f50b066..605421e 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -1142,22 +1142,6 @@ class SimpleAlertInfoBarDelegate : public InfoBarDelegate {
SimpleAlertInfoBarDelegate(WebContents*, const std::wstring&, void*) {}
};
-class CertStore {
- public:
- static CertStore* GetInstance() {
- NOTIMPLEMENTED();
- return NULL;
- }
- static CertStore* GetSharedInstance() {
- NOTIMPLEMENTED();
- return NULL;
- }
- int StoreCert(net::X509Certificate* cert, int render_process_host_id) {
- NOTIMPLEMENTED();
- return 0;
- }
-};
-
class LoginHandler {
public:
void SetAuth(const std::wstring& username,