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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 1617213002: Revert of Have each SandboxedProcessLauncherDelegate maintain a zygote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/memory_details.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 1631
1632 #if defined(OS_ANDROID) 1632 #if defined(OS_ANDROID)
1633 ThreadWatcherAndroid::RegisterApplicationStatusListener(); 1633 ThreadWatcherAndroid::RegisterApplicationStatusListener();
1634 #endif // defined(OS_ANDROID) 1634 #endif // defined(OS_ANDROID)
1635 1635
1636 #if !defined(DISABLE_NACL) 1636 #if !defined(DISABLE_NACL)
1637 BrowserThread::PostTask( 1637 BrowserThread::PostTask(
1638 BrowserThread::IO, 1638 BrowserThread::IO,
1639 FROM_HERE, 1639 FROM_HERE,
1640 base::Bind(nacl::NaClProcessHost::EarlyStartup)); 1640 base::Bind(nacl::NaClProcessHost::EarlyStartup));
1641
1642 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
1643 BrowserThread::PostTask(BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
1644 base::Bind(nacl::NaClProcessHost::EarlyZygoteLaunch));
1645 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
1646 #endif // !defined(DISABLE_NACL) 1641 #endif // !defined(DISABLE_NACL)
1647 1642
1648 // Make sure initial prefs are recorded 1643 // Make sure initial prefs are recorded
1649 PrefMetricsService::Factory::GetForProfile(profile_); 1644 PrefMetricsService::Factory::GetForProfile(profile_);
1650 1645
1651 PreBrowserStart(); 1646 PreBrowserStart();
1652 1647
1653 // Instantiate the notification UI manager, as this triggers a perf timer 1648 // Instantiate the notification UI manager, as this triggers a perf timer
1654 // used to measure startup time. TODO(stevenjb): Figure out what is actually 1649 // used to measure startup time. TODO(stevenjb): Figure out what is actually
1655 // triggering the timer and call that explicitly in the approprate place. 1650 // triggering the timer and call that explicitly in the approprate place.
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1886 chromeos::CrosSettings::Shutdown(); 1881 chromeos::CrosSettings::Shutdown();
1887 #endif // defined(OS_CHROMEOS) 1882 #endif // defined(OS_CHROMEOS)
1888 #endif // defined(OS_ANDROID) 1883 #endif // defined(OS_ANDROID)
1889 } 1884 }
1890 1885
1891 // Public members: 1886 // Public members:
1892 1887
1893 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1888 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1894 chrome_extra_parts_.push_back(parts); 1889 chrome_extra_parts_.push_back(parts);
1895 } 1890 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/memory_details.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698