Chromium Code Reviews| Index: chrome/browser/crash_upload_list.cc |
| diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc |
| index d10980f6a94c1f7994398596b1ca47969f6eb843..1e599eb952e51a2b28fc056e7fe3cce95971e688 100644 |
| --- a/chrome/browser/crash_upload_list.cc |
| +++ b/chrome/browser/crash_upload_list.cc |
| @@ -9,6 +9,7 @@ |
| #include "base/file_util.h" |
| #include "base/string_number_conversions.h" |
| #include "base/string_split.h" |
| +#include "chrome/browser/crash_upload_list_win.h" |
| #include "chrome/common/chrome_paths.h" |
| #include "content/browser/browser_thread.h" |
| @@ -17,31 +18,62 @@ CrashUploadList::CrashInfo::CrashInfo(const std::string& c, const base::Time& t) |
| CrashUploadList::CrashInfo::~CrashInfo() {} |
| +// static |
| +CrashUploadList* CrashUploadList::Create(Delegate* delegate) { |
| +#if defined(OS_WIN) |
| + return new CrashUploadListWin(delegate); |
| +#else |
| + return new CrashUploadList(delegate); |
| +#endif |
| +} |
| + |
| CrashUploadList::CrashUploadList(Delegate* delegate) : delegate_(delegate) {} |
| CrashUploadList::~CrashUploadList() {} |
| void CrashUploadList::LoadCrashListAsynchronously() { |
| BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| - NewRunnableMethod(this, &CrashUploadList::LoadUploadLog)); |
| + NewRunnableMethod(this, |
| + &CrashUploadList::LoadCrashListAndInformDelegateOfCompletion)); |
| } |
| void CrashUploadList::ClearDelegate() { |
| delegate_ = NULL; |
| } |
| -void CrashUploadList::LoadUploadLog() { |
| + |
| +void CrashUploadList::LoadCrashListAndInformDelegateOfCompletion() { |
| + LoadCrashList(); |
| + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| + NewRunnableMethod(this, &CrashUploadList::InformDelegateOfCompletion)); |
| +} |
| + |
| +void CrashUploadList::LoadCrashList() { |
|
stuartmorgan
2011/03/30 16:28:10
This function is doing a couple of things now; you
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| FilePath crash_dir_path; |
| PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path); |
| FilePath upload_log_path = crash_dir_path.AppendASCII("uploads.log"); |
| if (file_util::PathExists(upload_log_path)) { |
| std::string contents; |
| + std::vector<std::string> log_entries; |
| file_util::ReadFileToString(upload_log_path, &contents); |
| - base::SplitStringAlongWhitespace(contents, &log_entries_); |
| + base::SplitStringAlongWhitespace(contents, &log_entries); |
| + |
| + std::vector<std::string>::reverse_iterator i; |
| + for (i = log_entries.rbegin(); i != log_entries.rend(); ++i) { |
| + std::vector<std::string> components; |
| + base::SplitString(*i, ',', &components); |
| + // Skip any blank (or corrupted) lines. |
| + if (components.size() != 2) |
| + continue; |
| + double seconds_since_epoch; |
| + if (!base::StringToDouble(components[0], &seconds_since_epoch)) |
| + continue; |
| + CrashInfo info(components[1], |
| + base::Time::FromDoubleT(seconds_since_epoch)); |
| + crashes_.push_back(info); |
| + } |
| } |
| - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| - NewRunnableMethod(this, &CrashUploadList::InformDelegateOfCompletion)); |
| } |
| void CrashUploadList::InformDelegateOfCompletion() { |
| @@ -52,17 +84,11 @@ void CrashUploadList::InformDelegateOfCompletion() { |
| void CrashUploadList::GetUploadedCrashes(unsigned int max_count, |
| std::vector<CrashInfo>* crashes) { |
| - std::vector<std::string>::reverse_iterator i; |
| - for (i = log_entries_.rbegin(); i != log_entries_.rend(); ++i) { |
| - std::vector<std::string> components; |
| - base::SplitString(*i, ',', &components); |
| - // Skip any blank (or corrupted) lines. |
| - if (components.size() != 2) |
| - continue; |
| - double seconds_since_epoch; |
| - if (!base::StringToDouble(components[0], &seconds_since_epoch)) |
| - continue; |
| - CrashInfo info(components[1], base::Time::FromDoubleT(seconds_since_epoch)); |
| - crashes->push_back(info); |
| - } |
| + std::copy(crashes_.begin(), |
| + crashes_.begin() + std::min(crashes_.size(), max_count), |
| + std::back_inserter(*crashes)); |
| +} |
| + |
| +std::vector<CrashUploadList::CrashInfo>& CrashUploadList::crashes() { |
| + return crashes_; |
| } |