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

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

Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to base/task/cancelable_task_tracker* Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/system/syslogs_provider.h ('k') | chrome/browser/chromeos/version_loader.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 340b7dfd54c1428d0fe2506e38c9752f260ddc2a..f8fd4b0abcd4dee2a098ae1c4a1edba1ed62e7ae 100644
--- a/chrome/browser/chromeos/system/syslogs_provider.cc
+++ b/chrome/browser/chromeos/system/syslogs_provider.cc
@@ -182,11 +182,11 @@ LogDictionaryType* GetSystemLogs(base::FilePath* zip_file_name,
class SyslogsProviderImpl : public SyslogsProvider {
public:
// SyslogsProvider implementation:
- virtual CancelableTaskTracker::TaskId RequestSyslogs(
+ virtual base::CancelableTaskTracker::TaskId RequestSyslogs(
bool compress_logs,
SyslogsContext context,
const ReadCompleteCallback& callback,
- CancelableTaskTracker* tracker) OVERRIDE;
+ base::CancelableTaskTracker* tracker) OVERRIDE;
static SyslogsProviderImpl* GetInstance();
@@ -196,7 +196,7 @@ class SyslogsProviderImpl : public SyslogsProvider {
// Reads system logs, compresses content if requested.
// Called from blocking pool thread.
void ReadSyslogs(
- const CancelableTaskTracker::IsCanceledCallback& is_canceled,
+ const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
bool compress_logs,
SyslogsContext context,
const ReadCompleteCallback& callback);
@@ -213,7 +213,7 @@ class SyslogsProviderImpl : public SyslogsProvider {
// If not canceled, run callback on originating thread (the thread on which
// ReadSyslogs was run).
static void RunCallbackIfNotCanceled(
- const CancelableTaskTracker::IsCanceledCallback& is_canceled,
+ const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
base::TaskRunner* origin_runner,
const ReadCompleteCallback& callback,
LogDictionaryType* logs,
@@ -225,13 +225,14 @@ class SyslogsProviderImpl : public SyslogsProvider {
SyslogsProviderImpl::SyslogsProviderImpl() {
}
-CancelableTaskTracker::TaskId SyslogsProviderImpl::RequestSyslogs(
+base::CancelableTaskTracker::TaskId SyslogsProviderImpl::RequestSyslogs(
bool compress_logs,
SyslogsContext context,
const ReadCompleteCallback& callback,
- CancelableTaskTracker* tracker) {
- CancelableTaskTracker::IsCanceledCallback is_canceled;
- CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled);
+ base::CancelableTaskTracker* tracker) {
+ base::CancelableTaskTracker::IsCanceledCallback is_canceled;
+ base::CancelableTaskTracker::TaskId id =
+ tracker->NewTrackedTaskId(&is_canceled);
ReadCompleteCallback callback_runner =
base::Bind(&SyslogsProviderImpl::RunCallbackIfNotCanceled,
@@ -295,7 +296,7 @@ SyslogsMemoryHandler::~SyslogsMemoryHandler() {}
// Called from blocking pool thread.
void SyslogsProviderImpl::ReadSyslogs(
- const CancelableTaskTracker::IsCanceledCallback& is_canceled,
+ const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
bool compress_logs,
SyslogsContext context,
const ReadCompleteCallback& callback) {
@@ -373,7 +374,7 @@ const char* SyslogsProviderImpl::GetSyslogsContextString(
// static
void SyslogsProviderImpl::RunCallbackIfNotCanceled(
- const CancelableTaskTracker::IsCanceledCallback& is_canceled,
+ const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
base::TaskRunner* origin_runner,
const ReadCompleteCallback& callback,
LogDictionaryType* logs,
« no previous file with comments | « chrome/browser/chromeos/system/syslogs_provider.h ('k') | chrome/browser/chromeos/version_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698