OLD | NEW |
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 Loading... |
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) |
1641 #endif // !defined(DISABLE_NACL) | 1646 #endif // !defined(DISABLE_NACL) |
1642 | 1647 |
1643 // Make sure initial prefs are recorded | 1648 // Make sure initial prefs are recorded |
1644 PrefMetricsService::Factory::GetForProfile(profile_); | 1649 PrefMetricsService::Factory::GetForProfile(profile_); |
1645 | 1650 |
1646 PreBrowserStart(); | 1651 PreBrowserStart(); |
1647 | 1652 |
1648 // Instantiate the notification UI manager, as this triggers a perf timer | 1653 // Instantiate the notification UI manager, as this triggers a perf timer |
1649 // used to measure startup time. TODO(stevenjb): Figure out what is actually | 1654 // used to measure startup time. TODO(stevenjb): Figure out what is actually |
1650 // triggering the timer and call that explicitly in the approprate place. | 1655 // triggering the timer and call that explicitly in the approprate place. |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1881 chromeos::CrosSettings::Shutdown(); | 1886 chromeos::CrosSettings::Shutdown(); |
1882 #endif // defined(OS_CHROMEOS) | 1887 #endif // defined(OS_CHROMEOS) |
1883 #endif // defined(OS_ANDROID) | 1888 #endif // defined(OS_ANDROID) |
1884 } | 1889 } |
1885 | 1890 |
1886 // Public members: | 1891 // Public members: |
1887 | 1892 |
1888 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1893 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1889 chrome_extra_parts_.push_back(parts); | 1894 chrome_extra_parts_.push_back(parts); |
1890 } | 1895 } |
OLD | NEW |