diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 17:36:06 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 17:36:06 +0000 |
| commit | d4fe1fbc3ccfd3f55dd4311fb141fb327915f591 (patch) | |
| tree | f3bcff8f7101d9adb955adf29e4dffc669acc428 /chrome/app/chrome_dll_main.cc | |
| parent | 42f8c930d298f8edc24c11a2a2dd2567dbc4955b (diff) | |
| download | chromium_src-d4fe1fbc3ccfd3f55dd4311fb141fb327915f591.zip chromium_src-d4fe1fbc3ccfd3f55dd4311fb141fb327915f591.tar.gz chromium_src-d4fe1fbc3ccfd3f55dd4311fb141fb327915f591.tar.bz2 | |
- Made the writing of boot times happen on the file thread.
- Also combined two different ways of writing these times into
common code.
- Tweaked the color / font of the output
BUG=NONE
TEST=Ensure that boot times still display on login screen.
Review URL: http://codereview.chromium.org/2112006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 0f345af..fa9566e 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -90,6 +90,10 @@ #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" #endif +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/boot_times_loader.h" +#endif + extern int BrowserMain(const MainFunctionParams&); extern int RendererMain(const MainFunctionParams&); extern int GpuMain(const MainFunctionParams&); @@ -408,12 +412,7 @@ DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, int ChromeMain(int argc, char** argv) { #endif #if defined(OS_CHROMEOS) - // Output our start times. Save the result to appease warn_unused_result. - int result = 0; - result = system("if [ ! -f /tmp/uptime-chrome-main ]; " - "then cat /proc/uptime > /tmp/uptime-chrome-main ; fi"); - result = system("if [ ! -f /tmp/disk-chrome-main ]; " - "then cat /sys/block/sda/stat > /tmp/disk-chrome-main ; fi"); + chromeos::BootTimesLoader::SaveChromeMainStats(); #endif #if defined(OS_MACOSX) // TODO(mark): Some of these things ought to be handled in chrome_exe_main.mm. |