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

Unified Diff: content/gpu/gpu_main.cc

Issue 13814027: Linux: make current InitializeSandbox() private. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 63f5273a34d444ff198e6d89e0dae77c9ae47baf..b583d0a125da1eeecdbc524875b3381fff515383 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -16,6 +16,7 @@
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
#include "content/common/gpu/gpu_config.h"
+#include "content/common/sandbox_linux.h"
#include "content/gpu/gpu_child_thread.h"
#include "content/gpu/gpu_info_collector.h"
#include "content/gpu/gpu_process.h"
@@ -231,11 +232,14 @@ int GpuMain(const MainFunctionParams& parameters) {
#endif
if (do_init_sandbox) {
- if (watchdog_thread.get())
+ if (watchdog_thread.get()) {
watchdog_thread->Stop();
- gpu_info.sandboxed = InitializeSandbox();
- if (watchdog_thread.get())
+ }
+ gpu_info.sandboxed =
+ LinuxSandbox::InitializeSandbox(LinuxSandbox::SANDBOX_CONFIG_GPU);
+ if (watchdog_thread.get()) {
watchdog_thread->Start();
+ }
}
}
#endif

Powered by Google App Engine
This is Rietveld 408576698