Index: chrome/browser/chromeos/system/syslogs_provider.cc |
diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc |
index 3cfaab6421b14431235a45024f0b4a2b465ee5f2..ecc326748a108f51baea01de68fb7a887ab4d258 100644 |
--- a/chrome/browser/chromeos/system/syslogs_provider.cc |
+++ b/chrome/browser/chromeos/system/syslogs_provider.cc |
@@ -331,12 +331,17 @@ void SyslogsProviderImpl::ReadSyslogs( |
dbus::statistics::FORMAT_ALL); |
// Include recent network log events |
- (*logs)["network_event_log"] = network_event_log::GetAsString( |
- network_event_log::OLDEST_FIRST, |
- "time,file,desc", |
- network_event_log::kDefaultLogLevel, |
+ (*logs)["network_event_log"] = device_event_log::GetAsString( |
+ device_event_log::OLDEST_FIRST, "time,file", |
+ device_event_log::LOG_TYPE_NETWORK, device_event_log::kDefaultLogLevel, |
system::kFeedbackMaxLineCount); |
+ // Include recent non-network device events |
+ (*logs)["device_event_log"] = device_event_log::GetAsString( |
+ device_event_log::OLDEST_FIRST, "time,file", |
+ device_event_log::LOG_TYPE_NON_NETWORK, |
+ device_event_log::kDefaultLogLevel, system::kFeedbackMaxLineCount); |
+ |
// SyslogsMemoryHandler will clean itself up. |
// SyslogsMemoryHandler::OnDetailsAvailable() will modify |logs| and call |
// request->ForwardResult(logs, zip_content). |