diff options
| author | shinyak@chromium.org <shinyak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 12:53:12 +0000 |
|---|---|---|
| committer | shinyak@chromium.org <shinyak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 12:53:12 +0000 |
| commit | 38ce932a43f831bf3f6aabbe3ac126768f633eb0 (patch) | |
| tree | ec2b173100f890c0c556840d8dcc57c5a52a79d2 | |
| parent | 7797b8f85c27ade34b9ec3273d15b8438381df6d (diff) | |
| download | chromium_src-38ce932a43f831bf3f6aabbe3ac126768f633eb0.zip chromium_src-38ce932a43f831bf3f6aabbe3ac126768f633eb0.tar.gz chromium_src-38ce932a43f831bf3f6aabbe3ac126768f633eb0.tar.bz2 | |
switches::kNaClBrokerProcess and switches::kNaClLoaderProcess are only defined when disable_nacl=0.
So we should skip them when disable_nacl=1.
BUG=325019
Review URL: https://codereview.chromium.org/101213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238380 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/chrome_paths_win.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc index 2c556ab..55cad3f 100644 --- a/chrome/common/chrome_paths_win.cc +++ b/chrome/common/chrome_paths_win.cc @@ -115,10 +115,18 @@ bool ProcessNeedsProfileDir(const std::string& process_type) { // On windows we don't want subprocesses other than the browser process and // service processes to be able to use the profile directory because if it // lies on a network share the sandbox will prevent us from accessing it. - return process_type.empty() || - process_type == switches::kServiceProcess || - process_type == switches::kNaClBrokerProcess || - process_type == switches::kNaClLoaderProcess; + + if (process_type.empty() || process_type == switches::kServiceProcess) + return true; + +#if !defined(DISABLE_NACL) + if (process_type == switches::kNaClBrokerProcess || + process_type == switches::kNaClLoaderProcess) { + return true; + } +#endif + + return false; } } // namespace chrome |