diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 11:15:39 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 11:15:39 +0000 |
| commit | eeb0855be6b312f19729c474b7405c4e337435ef (patch) | |
| tree | 38358b6a98211de09de50afd91cce4754934addb /content/browser/zygote_main_linux.cc | |
| parent | 777cc4315e0efc2f8cad678093d5f32c53845224 (diff) | |
| download | chromium_src-eeb0855be6b312f19729c474b7405c4e337435ef.zip chromium_src-eeb0855be6b312f19729c474b7405c4e337435ef.tar.gz chromium_src-eeb0855be6b312f19729c474b7405c4e337435ef.tar.bz2 | |
Guards "remoting" initialization on the renderer side.
Following http://codereview.chromium.org/6684018,
remoting requires NSS to be initialized in the render side.
This change allows to compile with openssl.
BUG=none
TEST=compiles with use_openssl=1
Review URL: http://codereview.chromium.org/6665065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/zygote_main_linux.cc')
| -rw-r--r-- | content/browser/zygote_main_linux.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index 3c5db18..0448fba 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -604,12 +604,14 @@ static void PreSandboxInit() { FilePath media_path; if (PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path)) media::InitializeMediaLibrary(media_path); - +#if defined(USE_NSS) // NSS libraries are loaded before sandbox is activated. This is to allow // successful initialization of NSS which tries to load extra library files. // Doing so will allow NSS to be used within sandbox for chromoting. -#if defined(USE_NSS) base::LoadNSSLibraries(); +#else + // TODO(bulach): implement openssl support. + NOTREACHED() << "Remoting is not supported for openssl"; #endif // Ensure access to the Pepper plugins before the sandbox is turned on. |