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

Unified Diff: chrome/common/chrome_paths_win.cc

Issue 101213002: Fix windows build with disable_nacl=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Created 7 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths_win.cc
diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc
index 2c556abb42dbb7514245325cd30e63c9b7d17c8e..55cad3f23586121c742c21ce12e7724538dcec23 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698