Chromium Code Reviews| Index: chrome/browser/chromeos/system_logs/system_logs_fetcher.cc |
| diff --git a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc b/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc |
| index ea7fa9e5e92c893b3ab74e72733db5d10746a4bf..8c4cf1c11ece7c9b80db8529531a206d28eba444 100644 |
| --- a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc |
| +++ b/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h" |
| #include "chrome/browser/chromeos/system_logs/lsb_release_log_source.h" |
| #include "chrome/browser/chromeos/system_logs/memory_details_log_source.h" |
| +#include "chrome/browser/chromeos/system_logs/dbus_log_source.h" |
|
hashimoto
2012/11/12 04:33:16
nit: please sort.
stevenjb
2012/11/12 19:46:40
Done.
|
| #include "content/public/browser/browser_thread.h" |
| using content::BrowserThread; |
| @@ -27,6 +28,7 @@ SystemLogsFetcher::SystemLogsFetcher() |
| data_sources_.push_back(new CommandLineLogSource()); |
| data_sources_.push_back(new LsbReleaseLogSource()); |
| data_sources_.push_back(new MemoryDetailsLogSource()); |
| + data_sources_.push_back(new DbusLogSource()); |
|
hashimoto
2012/11/12 04:33:16
nit: Please sort.
stevenjb
2012/11/12 19:46:40
Done.
|
| num_pending_requests_ = data_sources_.size(); |
| } |
| @@ -51,13 +53,11 @@ void SystemLogsFetcher::AddResponse(SystemLogsResponse* response) { |
| for (SystemLogsResponse::const_iterator it = response->begin(); |
| it != response->end(); |
| ++it) { |
| - // It is false if the insert if there is already an element with the same |
| - // key. |
| + // It is an error to insert an element with a pre-existing key. |
| bool ok = response_->insert(*it).second; |
| DCHECK(ok) << "Duplicate key found: " << it->first; |
| } |
| - |
| --num_pending_requests_; |
| if (num_pending_requests_ > 0) |
| return; |
| @@ -67,4 +67,3 @@ void SystemLogsFetcher::AddResponse(SystemLogsResponse* response) { |
| } |
| } // namespace chromeos |
| - |