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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_task_token.h

Issue 550903002: [SyncFS] Rename BlockingFactor to TaskBlocker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: chrome/browser/sync_file_system/drive_backend/sync_task_token.h
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
index 0fb53238b1cd9083ea0df7cbce084e87e0371666..a32fd47fb8828362a4706938995a92856129d4d7 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
@@ -16,7 +16,7 @@ namespace sync_file_system {
namespace drive_backend {
class SyncTaskManager;
-struct BlockingFactor;
+struct TaskBlocker;
// Represents a running sequence of SyncTasks. Owned by a callback chain that
// should run exclusively, and held by SyncTaskManager when no task is running.
@@ -35,7 +35,7 @@ class SyncTaskToken {
const base::WeakPtr<SyncTaskManager>& manager,
base::SequencedTaskRunner* task_runner,
int64 token_id,
- scoped_ptr<BlockingFactor> blocking_factor);
+ scoped_ptr<TaskBlocker> task_blocker);
void UpdateTask(const tracked_objects::Location& location,
const SyncStatusCallback& callback);
@@ -50,9 +50,9 @@ class SyncTaskToken {
const SyncStatusCallback& callback() const { return callback_; }
void clear_callback() { callback_.Reset(); }
- void set_blocking_factor(scoped_ptr<BlockingFactor> blocking_factor);
- const BlockingFactor* blocking_factor() const;
- void clear_blocking_factor();
+ void set_task_blocker(scoped_ptr<TaskBlocker> task_blocker);
+ const TaskBlocker* task_blocker() const;
+ void clear_task_blocker();
int64 token_id() const { return token_id_; }
@@ -68,7 +68,7 @@ class SyncTaskToken {
SyncTaskToken(const base::WeakPtr<SyncTaskManager>& manager,
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
int64 token_id,
- scoped_ptr<BlockingFactor> blocking_factor,
+ scoped_ptr<TaskBlocker> task_blocker,
const SyncStatusCallback& callback);
base::WeakPtr<SyncTaskManager> manager_;
@@ -78,7 +78,7 @@ class SyncTaskToken {
SyncStatusCallback callback_;
scoped_ptr<TaskLogger::TaskLog> task_log_;
- scoped_ptr<BlockingFactor> blocking_factor_;
+ scoped_ptr<TaskBlocker> task_blocker_;
DISALLOW_COPY_AND_ASSIGN(SyncTaskToken);
};

Powered by Google App Engine
This is Rietveld 408576698