| 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 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1619 | 1619 |
| 1620 #if defined(OS_ANDROID) | 1620 #if defined(OS_ANDROID) |
| 1621 ThreadWatcherAndroid::RegisterApplicationStatusListener(); | 1621 ThreadWatcherAndroid::RegisterApplicationStatusListener(); |
| 1622 #endif // defined(OS_ANDROID) | 1622 #endif // defined(OS_ANDROID) |
| 1623 | 1623 |
| 1624 #if !defined(DISABLE_NACL) | 1624 #if !defined(DISABLE_NACL) |
| 1625 BrowserThread::PostTask( | 1625 BrowserThread::PostTask( |
| 1626 BrowserThread::IO, | 1626 BrowserThread::IO, |
| 1627 FROM_HERE, | 1627 FROM_HERE, |
| 1628 base::Bind(nacl::NaClProcessHost::EarlyStartup)); | 1628 base::Bind(nacl::NaClProcessHost::EarlyStartup)); |
| 1629 | |
| 1630 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) | |
| 1631 BrowserThread::PostTask(BrowserThread::PROCESS_LAUNCHER, FROM_HERE, | |
| 1632 base::Bind(nacl::NaClProcessHost::EarlyZygoteLaunch)); | |
| 1633 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) | |
| 1634 #endif // !defined(DISABLE_NACL) | 1629 #endif // !defined(DISABLE_NACL) |
| 1635 | 1630 |
| 1636 // Make sure initial prefs are recorded | 1631 // Make sure initial prefs are recorded |
| 1637 PrefMetricsService::Factory::GetForProfile(profile_); | 1632 PrefMetricsService::Factory::GetForProfile(profile_); |
| 1638 | 1633 |
| 1639 PreBrowserStart(); | 1634 PreBrowserStart(); |
| 1640 | 1635 |
| 1641 // Instantiate the notification UI manager, as this triggers a perf timer | 1636 // Instantiate the notification UI manager, as this triggers a perf timer |
| 1642 // used to measure startup time. TODO(stevenjb): Figure out what is actually | 1637 // used to measure startup time. TODO(stevenjb): Figure out what is actually |
| 1643 // triggering the timer and call that explicitly in the approprate place. | 1638 // triggering the timer and call that explicitly in the approprate place. |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1874 chromeos::CrosSettings::Shutdown(); | 1869 chromeos::CrosSettings::Shutdown(); |
| 1875 #endif // defined(OS_CHROMEOS) | 1870 #endif // defined(OS_CHROMEOS) |
| 1876 #endif // defined(OS_ANDROID) | 1871 #endif // defined(OS_ANDROID) |
| 1877 } | 1872 } |
| 1878 | 1873 |
| 1879 // Public members: | 1874 // Public members: |
| 1880 | 1875 |
| 1881 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1876 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1882 chrome_extra_parts_.push_back(parts); | 1877 chrome_extra_parts_.push_back(parts); |
| 1883 } | 1878 } |
| OLD | NEW |