summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 16:20:09 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 16:20:09 +0000
commitf5f2b8a646c123e151183e45268a805603afaf56 (patch)
tree5b3a89000791355d3459fab45f7b5310fdfdcb4e
parentae237a70c251d02336d832a51b3333ea3da8c2ad (diff)
downloadchromium_src-f5f2b8a646c123e151183e45268a805603afaf56.zip
chromium_src-f5f2b8a646c123e151183e45268a805603afaf56.tar.gz
chromium_src-f5f2b8a646c123e151183e45268a805603afaf56.tar.bz2
Boot times weren't getting displayed
BUG=NONE TEST=Ensure that boot times are shown at startup. Review URL: http://codereview.chromium.org/2102011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47805 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/boot_times_loader.cc6
-rw-r--r--chrome/browser/chromeos/boot_times_loader.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc
index 55ae8d2..7923402 100644
--- a/chrome/browser/chromeos/boot_times_loader.cc
+++ b/chrome/browser/chromeos/boot_times_loader.cc
@@ -19,12 +19,12 @@
namespace {
-typedef struct Stats {
+struct Stats {
std::string uptime;
std::string disk;
Stats() : uptime(std::string()), disk(std::string()) {}
-} Stats;
+};
}
@@ -103,7 +103,7 @@ void BootTimesLoader::Backend::GetBootTimes(
// Wait until login_prompt_ready is output by reposting.
FilePath log_dir(kLogPath);
- FilePath log_file = log_dir.Append(kLoginPromptReady);
+ FilePath log_file = log_dir.Append(uptime_prefix + kLoginPromptReady);
if (!file_util::PathExists(log_file)) {
ChromeThread::PostDelayedTask(
ChromeThread::FILE,
diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h
index 6e03ec5..d3ed514 100644
--- a/chrome/browser/chromeos/boot_times_loader.h
+++ b/chrome/browser/chromeos/boot_times_loader.h
@@ -70,7 +70,7 @@ class BootTimesLoader : public CancelableRequestProvider {
private:
// BootTimesLoader calls into the Backend on the file thread to load
- // and extract the boot times.
+ // the boot times.
class Backend : public base::RefCountedThreadSafe<Backend> {
public:
Backend() {}