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

Unified Diff: chrome/browser/sync/engine/syncer_thread2.h

Issue 6272025: Part 2 of repairing regressions to my old clang check plugins so Nico can (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright 2011 Created 9 years, 11 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/speech/speech_input_bubble.cc ('k') | chrome/browser/sync/engine/syncer_thread2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_thread2.h
diff --git a/chrome/browser/sync/engine/syncer_thread2.h b/chrome/browser/sync/engine/syncer_thread2.h
index 138d2a5929084006a84904cd6fc22cf73230b91c..847ef16e445bc255c0e89f2417be059a82a28f66 100644
--- a/chrome/browser/sync/engine/syncer_thread2.h
+++ b/chrome/browser/sync/engine/syncer_thread2.h
@@ -86,27 +86,23 @@ class SyncerThread : public sessions::SyncSession::Delegate {
// State pertaining to exponential backoff or throttling periods.
struct WaitInterval;
- // Internal state for every sync task that is scheduled.
- struct SyncSessionJob {
- // An enum used to describe jobs for scheduling purposes.
- enum Purpose {
- // Our poll timer schedules POLL jobs periodically based on a server
- // assigned poll interval.
- POLL,
- // A nudge task can come from a variety of components needing to force
- // a sync. The source is inferable from |session.source()|.
- NUDGE,
- // Typically used for fetching updates for a subset of the enabled types
- // during initial sync or reconfiguration. We don't run all steps of
- // the sync cycle for these (e.g. CleanupDisabledTypes is skipped).
- CONFIGURATION,
- };
-
- Purpose purpose;
- base::TimeTicks scheduled_start;
- linked_ptr<sessions::SyncSession> session;
+ // An enum used to describe jobs for scheduling purposes.
+ enum SyncSessionJobPurpose {
+ // Our poll timer schedules POLL jobs periodically based on a server
+ // assigned poll interval.
+ POLL,
+ // A nudge task can come from a variety of components needing to force
+ // a sync. The source is inferable from |session.source()|.
+ NUDGE,
+ // Typically used for fetching updates for a subset of the enabled types
+ // during initial sync or reconfiguration. We don't run all steps of
+ // the sync cycle for these (e.g. CleanupDisabledTypes is skipped).
+ CONFIGURATION,
};
+ // Internal state for every sync task that is scheduled.
+ struct SyncSessionJob;
+
// A component used to get time delays associated with exponential backoff.
// Encapsulated into a class to facilitate testing.
class DelayProvider {
@@ -120,7 +116,7 @@ class SyncerThread : public sessions::SyncSession::Delegate {
// Helper to assemble a job and post a delayed task to sync.
void ScheduleSyncSessionJob(const base::TimeDelta& delay,
- SyncSessionJob::Purpose purpose,
+ SyncSessionJobPurpose purpose,
sessions::SyncSession* session);
// Invoke the Syncer to perform a sync.
@@ -142,7 +138,7 @@ class SyncerThread : public sessions::SyncSession::Delegate {
// Determines if it is legal to run a sync job for |purpose| at
// |scheduled_start|. This checks current operational mode, backoff or
// throttling, freshness (so we don't make redundant syncs), and connection.
- bool ShouldRunJob(SyncSessionJob::Purpose purpose,
+ bool ShouldRunJob(SyncSessionJobPurpose purpose,
const base::TimeTicks& scheduled_start);
// 'Impl' here refers to real implementation of public functions, running on
« no previous file with comments | « chrome/browser/speech/speech_input_bubble.cc ('k') | chrome/browser/sync/engine/syncer_thread2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698