summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/system_logs/system_logs_fetcher.cc')
-rw-r--r--chrome/browser/chromeos/system_logs/system_logs_fetcher.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc b/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc
index ea7fa9e..446278e 100644
--- a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc
+++ b/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "chrome/browser/chromeos/system_logs/command_line_log_source.h"
+#include "chrome/browser/chromeos/system_logs/dbus_log_source.h"
#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"
@@ -25,6 +26,7 @@ SystemLogsFetcher::SystemLogsFetcher()
// Chrome data sources.
data_sources_.push_back(new CommandLineLogSource());
+ data_sources_.push_back(new DBusLogSource());
data_sources_.push_back(new LsbReleaseLogSource());
data_sources_.push_back(new MemoryDetailsLogSource());
@@ -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
-