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

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

Issue 1532423003: Have each SandboxedProcessLauncherDelegate maintain a zygote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fetch sandbox status Created 5 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 unified diff | Download patch
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/feature_list.h" 9 #include "base/feature_list.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 #endif 1027 #endif
1028 1028
1029 #if defined(USE_AURA) || defined(OS_MACOSX) 1029 #if defined(USE_AURA) || defined(OS_MACOSX)
1030 { 1030 {
1031 TRACE_EVENT0("shutdown", 1031 TRACE_EVENT0("shutdown",
1032 "BrowserMainLoop::Subsystem:ImageTransportFactory"); 1032 "BrowserMainLoop::Subsystem:ImageTransportFactory");
1033 ImageTransportFactory::Terminate(); 1033 ImageTransportFactory::Terminate();
1034 } 1034 }
1035 #endif 1035 #endif
1036 1036
1037 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
1038 ZygoteHostImpl::GetInstance()->TearDownAfterLastChild();
mdempsky 2015/12/22 21:21:33 You might try landing just this removal first/sepa
Greg K 2016/01/05 21:42:13 Done.
1039 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
1040
1041 // The device monitors are using |system_monitor_| as dependency, so delete 1037 // The device monitors are using |system_monitor_| as dependency, so delete
1042 // them before |system_monitor_| goes away. 1038 // them before |system_monitor_| goes away.
1043 // On Mac and windows, the monitor needs to be destroyed on the same thread 1039 // On Mac and windows, the monitor needs to be destroyed on the same thread
1044 // as they were created. On Linux, the monitor will be deleted when IO thread 1040 // as they were created. On Linux, the monitor will be deleted when IO thread
1045 // goes away. 1041 // goes away.
1046 #if defined(OS_WIN) 1042 #if defined(OS_WIN)
1047 system_message_window_.reset(); 1043 system_message_window_.reset();
1048 #elif defined(OS_MACOSX) 1044 #elif defined(OS_MACOSX)
1049 device_monitor_mac_.reset(); 1045 device_monitor_mac_.reset();
1050 #endif 1046 #endif
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 DCHECK(is_tracing_startup_for_duration_); 1469 DCHECK(is_tracing_startup_for_duration_);
1474 1470
1475 is_tracing_startup_for_duration_ = false; 1471 is_tracing_startup_for_duration_ = false;
1476 TracingController::GetInstance()->StopTracing( 1472 TracingController::GetInstance()->StopTracing(
1477 TracingController::CreateFileSink( 1473 TracingController::CreateFileSink(
1478 startup_trace_file_, 1474 startup_trace_file_,
1479 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1475 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1480 } 1476 }
1481 1477
1482 } // namespace content 1478 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698