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/browser/browser_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/browser/browser_main.cc')
-rw-r--r-- | chrome/browser/browser_main.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c58fbd6..9647314 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -96,6 +96,10 @@ #include "chrome/browser/gtk/gtk_util.h" #endif +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/boot_times_loader.h" +#endif + // TODO(port): several win-only methods have been pulled out of this, but // BrowserMain() as a whole needs to be broken apart so that it's usable by // other platforms. For now, it's just a stub. This is a serious work in @@ -732,7 +736,6 @@ int BrowserMain(const MainFunctionParams& parameters) { // Register the main thread by instantiating it, but don't call any methods. ChromeThread main_thread(ChromeThread::UI, MessageLoop::current()); - #if defined(OS_POSIX) int pipefd[2]; int ret = pipe(pipefd); @@ -903,6 +906,11 @@ int BrowserMain(const MainFunctionParams& parameters) { CreateChildThreads(browser_process.get()); +#if defined(OS_CHROMEOS) + // Now that the file thread exists we can record our stats. + chromeos::BootTimesLoader::RecordChromeMainStats(); +#endif + // Record last shutdown time into a histogram. browser_shutdown::ReadLastShutdownInfo(); |