diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 19:41:43 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 19:41:43 +0000 |
| commit | c1702d71f2fb3ba58cceb044c8e7401da1d5c9c8 (patch) | |
| tree | d4295fc8a134647c4672b7eeb7a8617e4f2a19df /content/common | |
| parent | 4de8252c14229f47df5fb78363d6bdb72c927d27 (diff) | |
| download | chromium_src-c1702d71f2fb3ba58cceb044c8e7401da1d5c9c8.zip chromium_src-c1702d71f2fb3ba58cceb044c8e7401da1d5c9c8.tar.gz chromium_src-c1702d71f2fb3ba58cceb044c8e7401da1d5c9c8.tar.bz2 | |
Refactor some more BrowserMain code. Move the small bit of remaining code that's required by all embedders to content.
BUG=90445
Review URL: http://codereview.chromium.org/7840041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/content_switches.cc | 6 | ||||
| -rw-r--r-- | content/common/content_switches.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc index 31d4b93..0587a60 100644 --- a/content/common/content_switches.cc +++ b/content/common/content_switches.cc @@ -503,6 +503,12 @@ const char kAuditAllHandles[] = "enable-handle-auditing-all"; const char kScrollPixels[] = "scroll-pixels"; #endif +#if defined(OS_MACOSX) || defined(OS_WIN) +// Use the system SSL library (Secure Transport on Mac, SChannel on Windows) +// instead of NSS for SSL. +const char kUseSystemSSL[] = "use-system-ssl"; +#endif + #if !defined(OFFICIAL_BUILD) // Causes the renderer process to throw an assertion on launch. const char kRendererCheckFalseTest[] = "renderer-check-false-test"; diff --git a/content/common/content_switches.h b/content/common/content_switches.h index 07e1c97..478b9b8 100644 --- a/content/common/content_switches.h +++ b/content/common/content_switches.h @@ -162,6 +162,10 @@ extern const char kAuditAllHandles[]; extern const char kScrollPixels[]; #endif +#if defined(OS_MACOSX) || defined(OS_WIN) +extern const char kUseSystemSSL[]; +#endif + #if !defined(OFFICIAL_BUILD) extern const char kRendererCheckFalseTest[]; #endif |