Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: chrome/browser/chromeos/system/syslogs_provider.cc

Issue 773703002: Generalize network_event_log -> device_event_log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + feedback Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/system_logs/device_event_log_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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).
« no previous file with comments | « no previous file | chrome/browser/chromeos/system_logs/device_event_log_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698