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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 276763002: Remove SandboxIPCProcess's dependency on chrome-sandbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 if (sandbox_binary.empty()) { 157 if (sandbox_binary.empty()) {
158 // This needs to be fatal. Talk to security@chromium.org if you feel 158 // This needs to be fatal. Talk to security@chromium.org if you feel
159 // otherwise. 159 // otherwise.
160 LOG(FATAL) << no_suid_error; 160 LOG(FATAL) << no_suid_error;
161 } 161 }
162 } else { 162 } else {
163 LOG(ERROR) << no_suid_error; 163 LOG(ERROR) << no_suid_error;
164 } 164 }
165 165
166 // Tickle the sandbox host and zygote host so they fork now. 166 // Tickle the sandbox host and zygote host so they fork now.
167 RenderSandboxHostLinux::GetInstance()->Init(sandbox_binary.value()); 167 RenderSandboxHostLinux::GetInstance()->Init();
168 ZygoteHostImpl::GetInstance()->Init(sandbox_binary.value()); 168 ZygoteHostImpl::GetInstance()->Init(sandbox_binary.value());
169 } 169 }
170 #endif 170 #endif
171 171
172 #if defined(USE_GLIB) 172 #if defined(USE_GLIB)
173 static void GLibLogHandler(const gchar* log_domain, 173 static void GLibLogHandler(const gchar* log_domain,
174 GLogLevelFlags log_level, 174 GLogLevelFlags log_level,
175 const gchar* message, 175 const gchar* message,
176 gpointer userdata) { 176 gpointer userdata) {
177 if (!log_domain) 177 if (!log_domain)
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 base::TimeDelta::FromSeconds(delay_secs)); 1130 base::TimeDelta::FromSeconds(delay_secs));
1131 } 1131 }
1132 1132
1133 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { 1133 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
1134 is_tracing_startup_ = false; 1134 is_tracing_startup_ = false;
1135 TracingController::GetInstance()->DisableRecording( 1135 TracingController::GetInstance()->DisableRecording(
1136 trace_file, base::Bind(&OnStoppedStartupTracing)); 1136 trace_file, base::Bind(&OnStoppedStartupTracing));
1137 } 1137 }
1138 1138
1139 } // namespace content 1139 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_sandbox_host_linux.h » ('j') | content/common/sandbox_linux/sandbox_linux.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698