diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 17:09:42 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 17:09:42 +0000 |
| commit | 0f43b4a799e778fac0ecb6bdb3a129096e156a90 (patch) | |
| tree | cb3325469e9d3d7e68f4c7f71a27ac274b68d8b3 /chrome/app/chrome_dll_main.cc | |
| parent | 30c942b07906bc38fda3f88ae43d6dc106de0c46 (diff) | |
| download | chromium_src-0f43b4a799e778fac0ecb6bdb3a129096e156a90.zip chromium_src-0f43b4a799e778fac0ecb6bdb3a129096e156a90.tar.gz chromium_src-0f43b4a799e778fac0ecb6bdb3a129096e156a90.tar.bz2 | |
Need to call BootTimesLoader::Get() after AtExitManager is created
BUG=None
TEST=Debug build of chromeos version of chrome doesn't crash w/ DCHECK() at startup.
Review URL: http://codereview.chromium.org/3035016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 034b82d..48fc1cd 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -442,9 +442,6 @@ DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, #elif defined(OS_POSIX) int ChromeMain(int argc, char** argv) { #endif -#if defined(OS_CHROMEOS) - chromeos::BootTimesLoader::Get()->SaveChromeMainStats(); -#endif #if defined(OS_MACOSX) // TODO(mark): Some of these things ought to be handled in chrome_exe_main.mm. // Under the current architecture, nothing in chrome_exe_main can rely @@ -466,6 +463,10 @@ int ChromeMain(int argc, char** argv) { // its main event loop to get rid of the cruft. base::ScopedNSAutoreleasePool autorelease_pool; +#if defined(OS_CHROMEOS) + chromeos::BootTimesLoader::Get()->SaveChromeMainStats(); +#endif + #if defined(OS_POSIX) base::GlobalDescriptors* g_fds = Singleton<base::GlobalDescriptors>::get(); g_fds->Set(kPrimaryIPCChannel, |