OLD | NEW |
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 "ash/touch/touch_observer_hud.h" | 8 #include "ash/touch/touch_observer_hud.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 (*logs)["dbus"] = dbus::statistics::GetAsString( | 329 (*logs)["dbus"] = dbus::statistics::GetAsString( |
330 dbus::statistics::SHOW_INTERFACE, | 330 dbus::statistics::SHOW_INTERFACE, |
331 dbus::statistics::FORMAT_ALL); | 331 dbus::statistics::FORMAT_ALL); |
332 | 332 |
333 // Include recent network log events | 333 // Include recent network log events |
334 (*logs)["network_event_log"] = chromeos::network_event_log::GetAsString( | 334 (*logs)["network_event_log"] = chromeos::network_event_log::GetAsString( |
335 chromeos::network_event_log::OLDEST_FIRST, | 335 chromeos::network_event_log::OLDEST_FIRST, |
336 chromeos::system::kFeedbackMaxLineCount); | 336 chromeos::system::kFeedbackMaxLineCount); |
337 | 337 |
338 if (ash::Shell::GetInstance()->touch_observer_hud()) { | 338 if (ash::Shell::GetInstance()->touch_observer_hud()) { |
339 (*logs)[kHUDLogDataKey] = | 339 (*logs)[chrome::kHUDLogDataKey] = |
340 ash::Shell::GetInstance()->touch_observer_hud()->GetLogAsString(); | 340 ash::Shell::GetInstance()->touch_observer_hud()->GetLogAsString(); |
341 } | 341 } |
342 | 342 |
343 // SyslogsMemoryHandler will clean itself up. | 343 // SyslogsMemoryHandler will clean itself up. |
344 // SyslogsMemoryHandler::OnDetailsAvailable() will modify |logs| and call | 344 // SyslogsMemoryHandler::OnDetailsAvailable() will modify |logs| and call |
345 // request->ForwardResult(logs, zip_content). | 345 // request->ForwardResult(logs, zip_content). |
346 scoped_refptr<SyslogsMemoryHandler> | 346 scoped_refptr<SyslogsMemoryHandler> |
347 handler(new SyslogsMemoryHandler(callback, logs, zip_content)); | 347 handler(new SyslogsMemoryHandler(callback, logs, zip_content)); |
348 // TODO(jamescook): Maybe we don't need to update histograms here? | 348 // TODO(jamescook): Maybe we don't need to update histograms here? |
349 handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS); | 349 handler->StartFetch(MemoryDetails::UPDATE_USER_METRICS); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 return Singleton<SyslogsProviderImpl, | 402 return Singleton<SyslogsProviderImpl, |
403 DefaultSingletonTraits<SyslogsProviderImpl> >::get(); | 403 DefaultSingletonTraits<SyslogsProviderImpl> >::get(); |
404 } | 404 } |
405 | 405 |
406 SyslogsProvider* SyslogsProvider::GetInstance() { | 406 SyslogsProvider* SyslogsProvider::GetInstance() { |
407 return SyslogsProviderImpl::GetInstance(); | 407 return SyslogsProviderImpl::GetInstance(); |
408 } | 408 } |
409 | 409 |
410 } // namespace system | 410 } // namespace system |
411 } // namespace chromeos | 411 } // namespace chromeos |
OLD | NEW |