Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2133)

Unified Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 7545018: Remove --enable-remoting flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_process_observer.cc
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index bf65d8633de5ea67572e5ce20ac189d23c237fe3..d221d89550c0bef5e94949c28b1a099dc67dc720 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -363,20 +363,14 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver() {
}
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
// Remoting requires NSS to function properly.
- if (!command_line.HasSwitch(switches::kSingleProcess) &&
- command_line.HasSwitch(switches::kEnableRemoting)) {
-#if defined(USE_NSS)
+ if (!command_line.HasSwitch(switches::kSingleProcess)) {
// We are going to fork to engage the sandbox and we have not loaded
// any security modules so it is safe to disable the fork check in NSS.
crypto::DisableNSSForkCheck();
crypto::ForceNSSNoDBInit();
crypto::EnsureNSSInit();
-#else
- // TODO(bulach): implement openssl support.
- NOTREACHED() << "Remoting is not supported for openssl";
-#endif
}
#elif defined(OS_WIN)
// crypt32.dll is used to decode X509 certificates for Chromoting.
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698