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

Side by Side Diff: chrome/browser/chromeos/system/syslogs_provider.cc

Issue 14876021: Re-factor network_event_log (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address final nits Created 7 years, 7 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/system/syslogs_provider.h" 5 #include "chrome/browser/chromeos/system/syslogs_provider.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 LoadCompressedLogs(zip_file, zip_content); 323 LoadCompressedLogs(zip_file, zip_content);
324 file_util::Delete(zip_file, false); 324 file_util::Delete(zip_file, false);
325 } 325 }
326 326
327 // Include dbus statistics summary 327 // Include dbus statistics summary
328 (*logs)["dbus"] = dbus::statistics::GetAsString( 328 (*logs)["dbus"] = dbus::statistics::GetAsString(
329 dbus::statistics::SHOW_INTERFACE, 329 dbus::statistics::SHOW_INTERFACE,
330 dbus::statistics::FORMAT_ALL); 330 dbus::statistics::FORMAT_ALL);
331 331
332 // Include recent network log events 332 // Include recent network log events
333 (*logs)["network_event_log"] = chromeos::network_event_log::GetAsString( 333 (*logs)["network_event_log"] = network_event_log::GetAsString(
334 chromeos::network_event_log::OLDEST_FIRST, 334 network_event_log::OLDEST_FIRST,
335 chromeos::system::kFeedbackMaxLineCount); 335 "time,file,desc",
336 network_event_log::kDefaultLogLevel,
337 system::kFeedbackMaxLineCount);
336 338
337 // SyslogsMemoryHandler will clean itself up. 339 // SyslogsMemoryHandler will clean itself up.
338 // SyslogsMemoryHandler::OnDetailsAvailable() will modify |logs| and call 340 // SyslogsMemoryHandler::OnDetailsAvailable() will modify |logs| and call
339 // request->ForwardResult(logs, zip_content). 341 // request->ForwardResult(logs, zip_content).
340 scoped_refptr<SyslogsMemoryHandler> 342 scoped_refptr<SyslogsMemoryHandler>
341 handler(new SyslogsMemoryHandler(callback, logs, zip_content)); 343 handler(new SyslogsMemoryHandler(callback, logs, zip_content));
342 // TODO(jamescook): Maybe we don't need to update histograms here? 344 // TODO(jamescook): Maybe we don't need to update histograms here?
343 handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS); 345 handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
344 } 346 }
345 347
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 return Singleton<SyslogsProviderImpl, 398 return Singleton<SyslogsProviderImpl,
397 DefaultSingletonTraits<SyslogsProviderImpl> >::get(); 399 DefaultSingletonTraits<SyslogsProviderImpl> >::get();
398 } 400 }
399 401
400 SyslogsProvider* SyslogsProvider::GetInstance() { 402 SyslogsProvider* SyslogsProvider::GetInstance() {
401 return SyslogsProviderImpl::GetInstance(); 403 return SyslogsProviderImpl::GetInstance();
402 } 404 }
403 405
404 } // namespace system 406 } // namespace system
405 } // namespace chromeos 407 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_notifier.cc ('k') | chrome/browser/chromeos/system_logs/network_event_log_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698